]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80690cc b3e6914)
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline...
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 13:10:38 +0000 (16:10 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 13:10:38 +0000 (16:10 +0300)
Conflicts:
arch/arm/mach-omap1/devices.c

1  2 
arch/arm/mach-omap2/devices.c patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/devices.c
Simple merge
diff --cc arch/arm/plat-omap/Kconfig
Simple merge
Clone of davem's net-next-2.6 tree