diff options
| author | Linus Torvalds <[email protected]> | 2009-11-17 17:19:54 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-11-17 17:19:54 +0000 |
| commit | a044a1b147a1c967e1a4b797c3e24c395f3d878a (patch) | |
| tree | 00d5f49c02f178e7312b8fe98f62030d5c3aca51 /fs/proc/array.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff) | |
| parent | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff) | |
| download | kernel-a044a1b147a1c967e1a4b797c3e24c395f3d878a.tar.gz kernel-a044a1b147a1c967e1a4b797c3e24c395f3d878a.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: ensure mfp is in correct range in mfp_{read,write}
[ARM] pxa/hx4700: fix hx4700 touchscreen pressure values
ARM: 5787/1: U300 COH 901 331 fixes
ARM: Fix warning in sa1100-flash.c
[ARM] Kirkwood: disable propagation of mbus error to the CPU local bus
[ARM] pxa: fix incorrect mfp_to_gpio() conversion
[ARM] pxa/colibri: fix AC97 ifdefs and add missing include
[ARM] pxa: fix missing underscores in mfp-pxa910.h
[ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions