]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66f75a5 b3431f5)
Merge branch 'omap/dt-missed-3.4' into drivers/mmc
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:45:55 +0000 (21:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:46:01 +0000 (21:46 +0200)
The omap/dt branch adds a few instances of mmc device nodes that
need to get changed to use the common bindings. Pull that into
a new branch so we can apply the patch in a single run.

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

diff --cc arch/arm/mach-omap2/devices.c
Simple merge
diff --cc arch/arm/mach-omap2/gpio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.