]> 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: 1fd3170 14f0f51)
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 1 Sep 2010 09:08:50 +0000 (10:08 +0100)
1  2 
arch/arm/mach-mx25/mach-cpuimx25.c patch | diff1 | diff2 | blob | history
arch/arm/mach-mx3/mach-cpuimx35.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-mx25/mach-cpuimx25.c
Simple merge
diff --cc arch/arm/mach-mx3/mach-cpuimx35.c
Simple merge
Clone of davem's net-next-2.6 tree