Linus Torvalds 34e2fde8a4 Merge master.kernel.org:/home/rmk/linux-2.6-arm ... * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) ARM: 5865/1: nuc900 ethernet driver needs mii ARM: 5864/1: Implement arch_reset() in NUC900 ARM: 5863/1: fix bugs of clock source of NUC900 ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range imx/mx3: depend on USB_ULPI for otg_ulpi_create ARM: MX3: make CPU revision number detection work on all boards mx25: pdk: add platform code for FEC support mx25: add support for FEC on i.MX25 mx25: s/NO_PAD_CTL/NO_PAD_CTRL/ mx31moboard: fix usbh device names mx3: add support for the mt9v022 camera sensor to pcm037 platform mx27: mxt_td60: Remove not used UART pins [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot [ARM] pxa/ttc_dkb: remove duplicate macro definition [ARM] pxa/zeus: provide power-source information when APM is enabled [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports [ARM] pxa/zeus: make internal zeus_get_pcb_info static [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310 [ARM] pxa/littleton: add UART3 GPIO config ...		2010-01-06 01:16:26 -08:00
..
accessibility	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
acpi	Merge branch 'resume-sci-force-bootparam' into release	2009-12-30 18:32:32 -05:00
amba
ata	Merge branch 'misc-2.6.33' into release	2009-12-24 01:19:00 -05:00
atm	drivers/atm: Correct code taking the size of a pointer	2009-12-13 19:56:33 -08:00
auxdisplay
base	devtmpfs: unlock mutex in case of string allocation error	2009-12-23 11:23:44 -08:00
block	aoe: switch to the new bio_flush_dcache_pages() interface	2009-12-22 09:12:48 +01:00
bluetooth	Bluetooth: Prevent ill-timed autosuspend in USB driver	2009-12-17 12:12:49 -08:00
cdrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-09 19:03:16 -08:00
char	tosh: Use non bkl ioctl	2010-01-04 12:31:21 -08:00
clocksource	cs5535: add a generic clock event MFGPT driver	2009-12-15 08:53:28 -08:00
connector
cpufreq	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
cpuidle	drivers/cpuidle: Move dereference after NULL test	2009-12-15 08:53:25 -08:00
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
dca
dio
dma	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-12-30 13:46:29 -08:00
edac	edac, pci: remove pesky debug printk	2009-12-24 11:07:09 +01:00
eisa
firewire	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
firmware	firmware: only allow EDD on x86	2009-12-15 08:53:34 -08:00
gpio	gpiolib: add support for changing value polarity in sysfs	2009-12-16 07:20:01 -08:00
gpu	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-12-23 08:59:32 -08:00
hid	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-12-17 16:48:08 -08:00
i2c	i2c-omap: OMAP3: Fix I2C lockup during timeout/error cases	2009-12-24 01:30:54 +00:00
ide	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
idle	cpumask: convert drivers/idle/i7300_idle.c to cpumask_var_t	2009-12-17 11:43:25 +10:30
ieee1394	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
ieee802154
infiniband	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-31 11:12:35 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-21 10:12:25 -08:00
leds	leds: leds-pwm: Set led_classdev max_brightness	2009-12-17 11:42:34 +00:00
lguest	lguest: fix bug in setting guest GDT entry	2010-01-04 12:33:33 -08:00
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
mca
md	md: allow a resync that is waiting for other resync to complete, to be aborted.	2009-12-30 15:25:23 +11:00
media	firewire: fix use of multiple AV/C devices, allow multiple FCP listeners	2009-12-29 19:58:16 +01:00
memstick
message	i2o: propogate the BKL down into the ioctl method	2010-01-04 12:31:21 -08:00
mfd	twl4030-irq.c: fix compiler warning due to raw-spinlock conversion	2009-12-31 17:26:05 -08:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-12-17 16:38:48 -08:00
mmc	sdhci-of: add support for the wii sdhci controller	2009-12-17 15:45:32 -08:00
mtd	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-12-17 16:38:06 -08:00
net	ARM: 5865/1: nuc900 ethernet driver needs mii	2010-01-05 20:53:07 +00:00
nubus
of	Merge commit 'origin/master' into next	2009-12-09 17:14:38 +11:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
parisc	parisc: Fixup last users of irq_chip->typename	2009-12-16 03:48:56 +00:00
parport	parport_pc.c: use correct length in strncmp	2009-12-16 07:20:12 -08:00
pci	pci: avoid compiler warning in quirks.c	2009-12-31 16:44:43 -08:00
pcmcia	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-30 13:13:24 -08:00
platform	dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should follow 0/-E convention	2009-12-30 12:42:53 -08:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-16 12:33:19 -08:00
power	Merge git://git.infradead.org/battery-2.6	2009-12-15 08:59:33 -08:00
pps
ps3
rapidio
regulator	regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()	2009-12-17 10:27:30 +00:00
rtc	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-12-17 16:38:06 -08:00
s390	[S390] qdio: convert global statistics to per-device stats	2010-01-04 09:05:58 +01:00
sbus	bbc_envctrl: Clean up properly if kthread_run() fails.	2010-01-04 15:31:10 -08:00
scsi	kfifo: fix warn_unused_result	2009-12-22 14:17:56 -08:00
serial	serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.	2009-12-24 14:52:43 +09:00
sfi
sh	sh: pfc: Fixup type mismatch in debug printks.	2009-12-09 15:51:27 +09:00
sn	ioc3/ioc4: fix error path on driver registration	2009-12-15 08:53:27 -08:00
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2009-12-17 15:59:05 -08:00
ssb
staging	Staging/vt66*: kconfig, depends on WLAN	2009-12-23 11:27:50 -08:00
tc
telephony
thermal	Merge branch 'misc-2.6.33' into release	2009-12-16 14:22:32 -05:00
uio	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
usb	USB: Fix a bug on appledisplay.c regarding signedness	2009-12-23 11:34:20 -08:00
uwb
video	[ARM] pxafb: fix building issue of incorrect reference	2009-12-29 14:11:27 +08:00
virtio
vlynq
w1
watchdog	[WATCHDOG] use resource_size()	2009-12-23 19:53:04 +00:00
xen	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
zorro
Kconfig	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
Makefile