projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 442a33e 08a48be)
Merge tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm...
authorArnd Bergmann <arnd@arndb.de>
Tue, 7 May 2013 12:46:50 +0000 (14:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 7 May 2013 12:47:17 +0000 (14:47 +0200)
From Tony Lindgren <tony@atomide.com>:

An urgent fix for a timer mismerge for and a regression fix for
musb device naming change.

* tag 'omap-for-v3.10/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: change the device names in usb_bind_phy
  ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/mach-omap2/board-4430sdp.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge
Domain: System / Kernel;