Merge branch 'master' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Dec 2009 19:39:35 +0000 (19:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 13 Dec 2009 19:39:35 +0000 (19:39 +0000)
commitfc7736688b046f91170591625b38f12a839ba994
treee7198a9fabfcea785cbb16375455dbdb6aa9871b
parentbc7ecbcbc2c0ff235382077b55de7896775afc16
parent9074e144c10cba5d6bb6b326a8be5347d38e4473
Merge branch 'master' into devel
drivers/pcmcia/pxa2xx_base.c