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
..
Kconfig	RapidIO: add mport driver for Tsi721 bridge	2011-11-02 16:07:01 -07:00
Makefile	rapidio/tsi721: add DMA engine support	2012-05-31 17:49:31 -07:00
tsi721_dma.c	rapidio/tsi721: add DMA engine support	2012-05-31 17:49:31 -07:00
tsi721.c	Merge commit 'v3.6-rc5' into next	2012-09-13 08:41:01 -06:00
tsi721.h	rapidio/tsi721: add DMA engine support	2012-05-31 17:49:31 -07:00