tree 7dd2004ece26081507af877d9dd40b1bd4eecc1a
parent 27edacac7d97d37ec77779c7da08345298a5d283
parent a3c2b511a844641f6d0b60bd84cd6076143b3f2d
author Russell King <rmk+kernel@arm.linux.org.uk> 1325769856 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1325769856 +0000

Merge branches 'fixes' and 'misc' into for-linus