Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.		2011-10-28 12:02:27 -07:00
..
accessibility
acpi	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:08:43 +02:00
amba	clk: amba bus: convert to clk_prepare()/clk_unprepare()	2011-09-27 09:25:51 +01:00
ata	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
auxdisplay
base	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
bluetooth	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
cdrom
char	Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux	2011-10-28 05:54:23 -07:00
clk
clocksource	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
connector	connector: add comm change event report to proc connector	2011-09-28 13:41:50 -04:00
cpufreq	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
cpuidle
crypto
dca
devfreq	PM / devfreq: Add basic governors	2011-10-02 00:19:34 +02:00
dio
dma
edac
eisa
firewire
firmware
gpio	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
gpu	Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux	2011-10-28 05:54:23 -07:00
hid	Merge branch 'next' into for-linus	2011-10-26 21:46:20 -07:00
hv	hv: remove struct hv_device_info from hyperv.h	2011-10-11 09:51:22 -06:00
hwmon	Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-28 05:14:48 -07:00
hwspinlock
i2c	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
ide	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
idle
ieee802154
infiniband	net: add skb frag size accessors	2011-10-19 03:10:46 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-10-27 08:44:20 +02:00
iommu	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
isdn	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-10-26 15:11:09 +02:00
leds	Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-28 05:04:26 -07:00
lguest
macintosh
mca
md	Merge branch 'for-linus' of git://neil.brown.name/md	2011-10-26 21:39:42 +02:00
media	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2011-10-25 15:18:39 +02:00
memstick
message
mfd	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
misc	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core	2011-10-25 12:13:59 +02:00
mmc	Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:41:50 +02:00
mtd	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
net	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
nfc
nubus
of	of_mdio: Don't phy_scan_fixups() twice	2011-10-25 06:55:52 +02:00
oprofile
parisc	doc: fix broken references	2011-09-27 18:08:04 +02:00
parport	parport_pc: release IO region properly if unsupported ITE887x card is found	2011-10-18 14:17:40 -07:00
pci	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:11:53 +02:00
pcmcia	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
pinctrl	pinctrl/sirf: fix sirfsoc_get_group_pins prototype	2011-10-25 10:43:57 +02:00
platform	thinkpad_acpi: Fix printk typo 'bluestooth'	2011-10-07 09:39:51 +02:00
pnp
power
pps
ps3
ptp
rapidio
regulator
rtc
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2011-10-25 13:25:22 +02:00
sbus
scsi	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2011-10-26 21:33:50 +02:00
sfi
sh
sn
spi	Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:41:50 +02:00
ssb
staging	Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux	2011-10-28 05:54:23 -07:00
target	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
tc
telephony
thermal
tty	Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:41:50 +02:00
uio	uio: Support physical addresses >32 bits on 32-bit systems	2011-10-18 11:18:57 -07:00
usb	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-28 12:02:27 -07:00
uwb
vhost
video	Merge branch 'clk' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:41:50 +02:00
virt
virtio	Add ethtool -g support to virtio_net	2011-10-24 02:07:21 -04:00
vlynq
w1
watchdog	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:03:38 +02:00
xen	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:44:09 +02:00
zorro	zorro: Fix four checkpatch warnings	2011-10-24 21:00:34 +02:00
Kconfig	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2011-10-26 15:39:02 +02:00