tree d12fd927f546eac8b6c5697bb5c60f9a5e48bece
parent 796aadeb1b2db9b5d463946766c5bbfd7717158c
parent f47c32f3ae604669c3af0b7a07917270a235bd84
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1218287372 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1218287372 +0100

Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux