Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

Browse source

...

This commit is contained in:

Russell King 2009-12-17 09:34:26 +00:00

parent a7a5ac58df 75e874c698

commit c0caac93f8

2 changed files with 3 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/arm/mach-pxa/Kconfig

View file

2

arch/arm/mach-pxa/devices.c

View file