]> 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: 0fdc54b ad001f1)
Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 25 Feb 2010 04:53:03 +0000 (20:53 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Feb 2010 04:53:03 +0000 (20:53 -0800)
1  2 
arch/arm/mach-omap2/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/id.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/io.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/pm34xx.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/prcm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/Makefile
Simple merge
diff --cc arch/arm/mach-omap2/id.c
Simple merge
diff --cc arch/arm/mach-omap2/io.c
Simple merge
diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge
diff --cc arch/arm/mach-omap2/prcm.c
Simple merge
Clone of davem's net-next-2.6 tree