Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 07:49:25 +0000 (08:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 May 2010 07:49:25 +0000 (08:49 +0100)
commita3685f00652af83f12b63e3b4ef48f29581ba48b
tree18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec
parentb12f3cbd7a9a869eae1eb108da02526b132ba80b
parent63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
arch/arm/Kconfig
arch/arm/Makefile