diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 14:50:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 14:50:01 -0800 |
commit | 07a6d5a49c985ae6111221b93b3a48772cc4b976 (patch) | |
tree | ab55ca70c64aa8d9d9c8c003092ae9d95d2bfc57 /drivers/net/e1000e | |
parent | b4297b01198bc2501038bb463b6631f6f3782cc0 (diff) | |
parent | 3fcca9ac6cbce35b3e81e247d375534117d5f4cd (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Update mach-types
ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
MAINTAINERS: add maintainer information for AMBA primecell drivers
[ARM] pxa/spitz: fix compile regression on spitz
ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
[ARM] pxa/cpufreq: fix index assignments for end marker
ARM: PNX4008: fix watchdog device driver name
[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
Diffstat (limited to 'drivers/net/e1000e')
0 files changed, 0 insertions, 0 deletions