tree 6de4096f1887e2c00966177354b1c378e59bd632
parent c06015148fa9a3cc452ec7121b8c3f59f4a7d6ac
parent fb60cf4ab52f3520c2119aa42f7d4ed8e7594eb6
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1159383474 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1159383474 +0100

Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel