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

Browse source

...

This commit is contained in:

Russell King 2010-01-28 21:59:58 +00:00

parent 00e4acb1e2 c70f5a6099

commit 0b6c135ea9

3 changed files with 15 additions and 6 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

1

arch/arm/mach-pxa/corgi.c

View file

6

arch/arm/mach-pxa/include/mach/mfp-pxa25x.h

View file

14

arch/arm/mach-pxa/irq.c

View file