tree 6bd4915b4289ef32c94ecd523f38bb13ca032e4a
parent 4a683a2c5e7cabe91218db28e56dc25e1b134ce3
parent d8cff1365ec568149d57aeed8279d745591d0fa1
author Russell King <rmk+kernel@arm.linux.org.uk> 1297105630 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1297105630 +0000

Merge branch 'fixes'