Bjorn Helgaas 9a5d5bd848 Merge commit 'v3.6-rc5' into pci/gavin-window-alignment ... * 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 15:54:57 -06:00
..
e1000	e1000: advertise transmit time stamping	2012-07-22 12:33:32 -07:00
e1000e	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
igb	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
igbvf	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgb	ixgb: use PCI_VENDOR_ID_INTEL	2012-07-20 10:59:41 -07:00
ixgbe	Merge commit 'v3.6-rc5' into pci/gavin-window-alignment	2012-09-13 15:54:57 -06:00
ixgbevf	netvm: propagate page->pfmemalloc from skb_alloc_page to skb	2012-07-31 18:42:46 -07:00
e100.c	net: e100: ucode is optional in some cases	2012-07-19 10:48:07 -07:00
Kconfig	Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.	2012-06-20 00:52:54 -07:00
Makefile