Commits · 27d1097d39509494706eaa2620ef3b1e780a3224 · Kirill Smelkov / linux

28 Oct, 2005 40 commits

Merge master.kernel.org:/home/rmk/linux-2.6-mmc · 27d1097d
Linus Torvalds authored Oct 28, 2005

27d1097d
Merge master.kernel.org:/home/rmk/linux-2.6-arm · 83928e17
Linus Torvalds authored Oct 28, 2005
```
Minor manual fixups for gfp_t clashes.
```
83928e17
Merge branch 'sx8' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · 9be16a03
Linus Torvalds authored Oct 28, 2005

9be16a03
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 5fadd053
Linus Torvalds authored Oct 28, 2005

5fadd053
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · e5dfa928
Linus Torvalds authored Oct 28, 2005

e5dfa928
Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block · 5dd96249
Linus Torvalds authored Oct 28, 2005
```
Manual fixup for trivial "gfp_t" changes.
```
5dd96249
Merge branch 'generic-dispatch' of git://brick.kernel.dk/data/git/linux-2.6-block · 28d721e2
Linus Torvalds authored Oct 28, 2005

28d721e2
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block · 0ee40c66
Linus Torvalds authored Oct 28, 2005

0ee40c66

[ARM] 3042/1: AAED-2000 - LCD panel informations · 50f4c001

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

The AAED-2000 is equiped with an 640x480 LCD.
This adds the parameters that will be passed to the AAEC-2000 platform code.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

50f4c001

[ARM] 3041/1: AAEC-2000 - CLCD controller platform glue · 049eb329

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

The AAEC-2000 has an ARM PrimeCell PL110 Color LCD Controller.
This patch contains the platform glue that will be used by specific boards.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

049eb329

[ARM] 3040/1: AAEC-2000 - Preliminary clock interface support · 4224b67c

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

Here is a preliminary clock interface support for the AAEC-2000.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4224b67c

[ARM] 3039/1: AAEC-2000 - Add MTD support · 4a91ca2e

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

This adds platform code for MTD devices on AAEC-2000.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4a91ca2e

[ARM] 3038/1: AAEC-2000 - Proper includes in hardware.h · f0904e29

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

linux/config.h is not necessary in hardware.h, while asm/sizes.h and asm/arch//aaec2000.h will be used later.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

f0904e29

[ARM] 3037/1: AAED-2000 - Add defines for GPIO registers on external port. · 4028ef4c

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

The AAED-2000 board has GPIO pins on an external port.
This patch adds the defines, and do the necessary mapping.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4028ef4c

[ARM] 3036/1: AAEC-2000 - Add defines for GPIO registers · 13b1d677

Bellido Nicolas authored Oct 28, 2005

Patch from Bellido Nicolas

Add defines for GPIO registers on the AAEC-2000 processor.
Signed-off-by: Nicolas Bellido <ml@acolin.be>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

13b1d677

Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15 · 236fa081
Linus Torvalds authored Oct 28, 2005

236fa081

[ARM] 2897/2: PXA2xx IRDA support · 6f475c01

Nicolas Pitre authored Oct 28, 2005

Patch from Nicolas Pitre

This is the PXA2xx common IRDA driver, plus platform support
for Lubbock and Mainstone.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

6f475c01

[ARM] 3035/1: RISCOS compat code fix · a999cb04

Nicolas Pitre authored Oct 28, 2005

Patch from Nicolas Pitre

From: Daniel Jacobowitz <dan@debian.org>

> I also fixed a bug that confused me greatly while trying to debug: one
> SIGILL has long been a SIGSEGV because of some broken RISCOS
> compatibility code.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

a999cb04

[ARM] 3031/1: fix typos in comments of mmc.h · 8573b80f

Erik Hovland authored Oct 28, 2005

Patch from Erik Hovland

I noticed that the same typo (i before c in associated) showed up twice
in the file kernel/include/linux/mmc/mmc.h.

This patch fixes both of the instances I found with this mistake. The
typos are in comments and should have no affect on working code.

E
Signed-off-by: Erik Hovland <erik@hovland.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

8573b80f

[ARM] 2921/1: Support for the RTC / nvram on the Comdial MP1000 · dd5b295f

Jon Ringle authored Oct 28, 2005

Patch from Jon Ringle

This adds support for the RTC and nvram on the Comdial MP1000

Signed-off-by: Jon Ringle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

dd5b295f

[ARM] 3029/1: Add HWUART support for PXA 255/26x · d9e29649

Matt Reimer authored Oct 28, 2005

Patch from Matt Reimer

Adds support for HWUART on PXA 255 / 26x. This patch originally came from
http://svn.rungie.com/svn/gumstix-buildroot/trunk/sources/kernel-patches/000-gumstix-hwuart.patch
and has been tweaked by me.
Signed-off-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

d9e29649

[ARM] 2787/2: PXA27x low power modes support · 80a18573

Todd Poynor authored Oct 28, 2005

Patch from Todd Poynor

Add symbols for PXA2xx PWRMODE register M field that selects low-power
mode, replace unadorned constants.  Honor power mode parameter of
pxa_cpu_suspend(mode), no longer force to 3 (sleep).  Full Deep Sleep
low-power mode support for PXA27x is pending generic PM interfaces to
select more than 2 suspend-to-RAM-style power modes, but this is
expected soon. This can be hardcoded in the meantime by replacing the
pxa_cpu_suspend() parameter value.  From David Burrage and Todd Poynor.
Try #2 removes one of the register copies and moves the code to save the
pxa_cpu_suspend parameter to immediately surround the call that requires
the parameter value be preserved.
Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

80a18573

[ARM] 2919/1: CS8900A ethernet driver modifications for the Comdial MP1000 · 917f68f8

Jon Ringle authored Oct 28, 2005

Patch from Jon Ringle

This patch gives support for the CS8900A ethernet chip on the Comdial MP1000

Signed-off-by: Jon Ringle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

917f68f8

[ARM] 2918/1: [update] Base port of Comdial MP1000 platfrom · 0b83f140

Jon Ringle authored Oct 28, 2005

Patch from Jon Ringle

Updated 2898/1 per comments:
- Removed fixup
- Moved code in mach-mp1000/ to mach-clps711x/
- Cleaned up code in mp1000-seprom.c. Eliminated code that displayed the contents of the eeprom
Please comment.

Signed-off-by: Jon Ringle
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

0b83f140

[PATCH] gfp_t: the rest · 260b2367

Al Viro authored Oct 21, 2005

zone handling, mapping->flags handling
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

260b2367

[PATCH] gfp_t: reiserfs mapping_set_gfp_mask() use · c4cdd038

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

c4cdd038

[PATCH] gfp_t: remaining bits of drivers/* · b4e3ca1a

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

b4e3ca1a

[PATCH] gfp_t: drivers/net · 9e24974d

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9e24974d

[PATCH] gfp_t: remaining bits of arch/* · 53f9fc93

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

53f9fc93

[PATCH] gfp_t: sound · 1ef64e67

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1ef64e67

[PATCH] gfp_t: drivers/infiniband · 87b750dc

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

87b750dc

[PATCH] gfp_t: drivers/scsi · c53033f6

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

c53033f6

[PATCH] gfp_t: kernel/* · 9796fdd8

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

9796fdd8

[PATCH] gfp_t: drivers/usb · 55016f10

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

55016f10

[PATCH] gfp_t: dma-mapping (simple cases) · 970a9e73

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

970a9e73

[PATCH] gfp_t: dma-mapping (xtensa) · 5fb5cbed

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5fb5cbed

[PATCH] gfp_t: dma-mapping (amd64) · f80aabb0

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

f80aabb0

[PATCH] gfp_t: dma-mapping (sh) · 6dae2c23

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6dae2c23

[PATCH] gfp_t: dma-mapping (ppc) · e82dd4d6

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

e82dd4d6

[PATCH] gfp_t: dma-mapping (parisc) · 5c1fb41f

Al Viro authored Oct 21, 2005

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

5c1fb41f