]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
1  2 
drivers/pcmcia/pxa2xx_base.c

Simple merge