Bjorn Helgaas 78890b5989 Merge commit 'v3.6-rc5' into next ... * commit 'v3.6-rc5': (1098 commits) Linux 3.6-rc5 HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured Remove user-triggerable BUG from mpol_to_str xen/pciback: Fix proper FLR steps. uml: fix compile error in deliver_alarm() dj: memory scribble in logi_dj Fix order of arguments to compat_put_time[spec|val] xen: Use correct masking in xen_swiotlb_alloc_coherent. xen: fix logical error in tlb flushing xen/p2m: Fix one-off error in checking the P2M tree directory. powerpc: Don't use __put_user() in patch_instruction powerpc: Make sure IPI handlers see data written by IPI senders powerpc: Restore correct DSCR in context switch powerpc: Fix DSCR inheritance in copy_thread() powerpc: Keep thread.dscr and thread.dscr_inherit in sync powerpc: Update DSCR on all CPUs when writing sysfs dscr_default powerpc/powernv: Always go into nap mode when CPU is offline powerpc: Give hypervisor decrementer interrupts their own handler powerpc/vphn: Fix arch_update_cpu_topology() return value ARM: gemini: fix the gemini build ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/rapidio/devices/tsi721.c		2012-09-13 08:41:01 -06:00
..
agp	Merge commit 'v3.6-rc5' into next	2012-09-13 08:41:01 -06:00
hw_random	omap-rng: fix use of SIMPLE_DEV_PM_OPS	2012-08-10 12:28:05 +02:00
ipmi	char/ipmi: remove local ioctl defines replaced by generic ones	2012-07-23 12:48:04 +02:00
mwave	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
pcmcia	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
tpm	tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP	2012-08-10 14:29:50 +02:00
xilinx_hwicap	xilinx_hwicap: reset XHI_MAX_RETRIES	2012-04-19 19:09:18 -07:00
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	2012-04-05 17:34:30 -07:00
applicom.c
applicom.h
bfin-otp.c
bsr.c	powerpc/BSR: cleanup the error path of bsr_init	2012-07-17 10:27:38 -07:00
ds1302.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ds1620.c
dsp56k.c
dtlk.c
efirtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
generic_nvram.c
genrtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hangcheck-timer.c
hpet.c	printk(): add KERN_CONT where needed in hpet and vt code	2012-04-09 10:30:39 -07:00
i8k.c
Kconfig	ramoops: Move to fs/pstore/ram.c	2012-05-16 08:06:37 -07:00
lp.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
Makefile	ramoops: Move to fs/pstore/ram.c	2012-05-16 08:06:37 -07:00
mbcs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
mbcs.h
mem.c	powerpc: Disable /dev/port interface on systems without an ISA bridge	2012-07-11 18:22:32 +10:00
misc.c
mmtimer.c
msm_smd_pkt.c
mspec.c	[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts	2012-07-26 10:55:26 -07:00
nsc_gpio.c
nvram.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
nwbutton.c
nwbutton.h
nwflash.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
pc8736x_gpio.c
ppdev.c
ps3flash.c
random.c	random: mix in architectural randomness in extract_buf()	2012-07-27 22:37:20 -04:00
raw.c
rtc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
scx200_gpio.c
snsc_event.c
snsc.c
snsc.h
sonypi.c	sonypi: Use struct dev_pm_ops for power management	2012-07-01 13:31:14 +02:00
tb0219.c
tile-srom.c	tile-srom.c driver: minor code cleanup	2012-04-02 12:14:10 -04:00
tlclk.c
toshiba.c
ttyprintk.c
uv_mmtimer.c
virtio_console.c	virtio: console: tell host of open ports after resume from s3/s4	2012-05-17 12:14:33 +03:00