tree 024e47cb0ae1cfb96c799d21abf18884ae356c18
parent 1406de8e11eb043681297adf86d6892ff8efc27a
parent 3ac19bb443255579b30f05af5e688b6c73b1bb91
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1242492859 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1242492859 +0100

Merge branch 'fixes-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux