Merge branches 'arm', 'at91', 'ep93xx', 'iop', 'ks8695', 'misc', 'mxc', 'ns9x', 'orion', 'pxa', 'sa1100', 's3c' and 'sparsemem' into devel - linux - Linux Kernel (branches are rebased on master from time to time)

diff options

author	Russell King <rmk@dyn-67.arm.linux.org.uk>	2008-04-19 17:17:25 +0100
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2008-04-19 17:17:25 +0100
commit	d1964dab60ce7c104dd21590e987a8787db18051 (patch)
tree	b417631b77f88424760bd87011dc8fb2ea810906
parent	ba9279519b371340e01cadf4c230e9d52a4bf8c4 (diff)
parent	ad48ce74f70a201c4c1cf3b4e8f6b6203a2e4a8d (diff)
parent	b685004f8dea2daae0306edcd358ed7de751aee9 (diff)
parent	c34002c102880bfac5b449b41e5313dcda186db8 (diff)
parent	fdb72fd84c26438a7dd754a1cc74890aca7f1b77 (diff)
parent	c48b2e90aecf037f53913fc8d198d01fce0fbf3c (diff)
parent	3a8daaa49fb71d90e45d1e86d7f9f9e298bda05c (diff)
parent	04c366f06341259c88886a0d359e3597ba4c23f6 (diff)
parent	875492511a4afce7880c9dd0ca71462c299b40e6 (diff)
parent	58762e77aec49aa4b43a9ff62e7a3aee17720c41 (diff)
parent	3e238be2f75f2a6d5d5064eda46ac96268c6411e (diff)
parent	140749e2bf8d7c80a50c9fcce1435bb2b4e423c4 (diff)
parent	05944d74bc28fffbcce159cb915d0acff82f30a1 (diff)
download	linux-d1964dab60ce7c104dd21590e987a8787db18051.tar.bz2

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