Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 3 Aug 2009 16:58:02 +0000 (17:58 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Aug 2009 16:58:02 +0000 (17:58 +0100)
commit38a6fe8c013e72c402b37a7ea400387120f460d8
tree2b27c3bee7d8fe26d39084c95dca065b47444004
parent320145fac91955ee35a6af7e1c2b42388a17b3d8
parent909db80297ba65699a77d877f7bf618ba960f6fc
Merge branch 's3c-fixes-rc4-2' of git://aeryn.fluff.org.uk/bjdooks/linux