David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c

2008-12-02 19:50:27 -08:00

..

boot

ftrace: rename FTRACE to FUNCTION_TRACER

2008-10-20 18:27:03 +02:00

common

[ARM] sharpsl_pm: fix compilation w/o CONFIG_PM

2008-10-30 22:10:15 +08:00

configs

[ARM] pxa/corgi: update default config to exclude tosa from being built

2008-11-26 12:51:42 +08:00

include/asm

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2008-11-13 11:30:25 -08:00

kernel

[ARM] fix naming of MODULE_START / MODULE_END

2008-11-06 17:13:47 +00:00

lib

Merge branch 'ptebits' into devel

2008-10-09 21:31:56 +01:00

mach-aaec2000

…

mach-at91

[ARM] 5326/1: AFEB9260: Fix for i2c_board_info structure

2008-10-30 15:43:42 +00:00

mach-clps711x

[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants

2008-11-13 15:05:03 +00:00

mach-clps7500

[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants

2008-11-13 15:04:52 +00:00

mach-davinci

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-ebsa110

…

mach-ep93xx

[ARM] ep93xx: fix OHCI DMA mask

2008-10-30 14:41:48 +00:00

mach-footbridge

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-h720x

[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants

2008-11-13 15:04:52 +00:00

mach-imx

[ARM] gpio_free might sleep, arm architecture

2008-10-30 14:41:50 +00:00

mach-integrator

[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants

2008-11-13 14:47:59 +00:00

mach-iop13xx

iop-adma: use iop_paranoia() for debug BUG_ONs

2008-11-11 13:12:33 -07:00

mach-iop32x

…

mach-iop33x

…

mach-ixp4xx

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-10-31 00:17:34 -07:00

mach-ixp23xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ixp2000

genirq: fix name space collisions of nr_irqs in arch/*

2008-10-16 16:53:30 +02:00

mach-kirkwood

[ARM] 5321/1: Kirkwood: fix typo in Makefile

2008-10-23 19:58:19 +01:00

mach-ks8695

[ARM] gpio_free might sleep, arm architecture

2008-10-30 14:41:50 +00:00

mach-l7200

…

mach-lh7a40x

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-loki

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-11 10:09:45 -07:00

mach-msm

[ARM] msm: vreg interface to msm7k pmic

2008-10-22 02:41:00 -07:00

mach-mv78xx0

[ARM] mv78xx0: force link speed/duplex on eth2/eth3

2008-10-19 14:29:05 -04:00

mach-mx2

…

mach-mx3

[ARM] mx31ads: Add missing include

2008-10-30 15:58:09 +01:00

mach-netx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ns9xxx

[ARM] gpio_free might sleep, arm architecture

2008-10-30 14:41:50 +00:00

mach-omap1

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-16 11:25:32 -07:00

mach-omap2

ARM: OMAP: Fix compiler warnings in gpmc.c

2008-11-04 13:35:06 -08:00

mach-orion5x

[ARM] gpio_free might sleep, arm architecture

2008-10-30 14:41:50 +00:00

mach-pnx4008

…

mach-pxa

[ARM] pxa/palmtx: misc fixes to use generic GPIO API

2008-11-27 22:47:26 +08:00

mach-realview

[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants

2008-11-13 14:47:59 +00:00

mach-rpc

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

mach-s3c2400

…

mach-s3c2410

spi: fix spi_s3c24xx_gpio num_chipselect

2008-12-01 19:55:24 -08:00

mach-s3c2412

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2440

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2442

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2443

Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

2008-10-17 14:29:03 +01:00

mach-sa1100

ide: remove dead <asm-arm/arch-sa1100/ide.h>

2008-10-17 18:09:15 +02:00

mach-shark

…

mach-versatile

[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants

2008-11-13 14:47:59 +00:00

mm

[ARM] iop: iop3xx needs registers mapped uncached+unbuffered

2008-11-09 11:18:36 +00:00

nwfpe

…

oprofile

…

plat-iop

[ARM] iop: iop3xx needs registers mapped uncached+unbuffered

2008-11-09 11:18:36 +00:00

plat-mxc

[ARM] MXC: Fix mxc_gpio_get(), which must read PSR register instead DR.

2008-10-30 15:56:35 +01:00

plat-omap

ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling

2008-11-26 14:35:16 -08:00

plat-orion

…

plat-s3c

[ARM] S3C24XX: Additional include moves

2008-10-07 23:09:51 +01:00

plat-s3c24xx

Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

2008-10-17 14:29:03 +01:00

tools

…

vfp

…

Kconfig

Merge commit 'v2.6.28-rc2' into tracing/urgent

2008-10-27 10:50:54 +01:00

Kconfig-nommu

…

Kconfig.debug

…

Makefile

[ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM

2008-10-22 02:39:32 -07:00