26438a7dd754a1cc74890aca7f1b77
parent c48b2e90aecf037f53913fc8d198d01fce0fbf3c
parent 3a8daaa49fb71d90e45d1e86d7f9f9e298bda05c
parent 04c366f06341259c88886a0d359e3597ba4c23f6
parent 875492511a4afce7880c9dd0ca71462c299b40e6
parent 58762e77aec49aa4b43a9ff62e7a3aee17720c41
parent 3e238be2f75f2a6d5d5064eda46ac96268c6411e
parent 140749e2bf8d7c80a50c9fcce1435bb2b4e423c4
parent 05944d74bc28fffbcce159cb915d0acff82f30a1
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1208621845 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1208621845 +0100

Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel