Linus Torvalds 84eda28060 Merge branch 'kmap_atomic' of git://github.com/congwang/linux ... Pull final kmap_atomic cleanups from Cong Wang: "This should be the final round of cleanup, as the definitions of enum km_type finally get removed from the whole tree. The patches have been in linux-next for a long time." * 'kmap_atomic' of git://github.com/congwang/linux: pipe: remove KM_USER0 from comments vmalloc: remove KM_USER0 from comments feature-removal-schedule.txt: remove kmap_atomic(page, km_type) tile: remove km_type definitions um: remove km_type definitions asm-generic: remove km_type definitions avr32: remove km_type definitions frv: remove km_type definitions powerpc: remove km_type definitions arm: remove km_type definitions highmem: remove the deprecated form of kmap_atomic tile: remove usage of enum km_type frv: remove the second parameter of kmap_atomic_primary() jbd2: remove the second argument of kmap_atomic		2012-07-27 11:26:48 -07:00
..
boot	powerpc/85xx: Add phy nodes in SGMII mode for MPC8536/44/72DS & P2020DS	2012-07-12 10:08:09 -05:00
configs	powerpc: Enable pseries hardware RNG and crypto modules	2012-07-27 11:42:32 +10:00
include/asm	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-07-27 11:26:48 -07:00
kernel	powerpc/ftrace: Trace function graph entry before updating index	2012-07-27 11:42:34 +10:00
kvm	powerpc/kvm/bookehv: Fix build regression	2012-07-27 11:42:32 +10:00
lib	powerpc: Put the gpr save/restore functions in their own section	2012-07-11 14:19:59 +10:00
math-emu	powerpc/math_emu/efp: Look for errata handler when type mismatches	2011-10-06 23:36:47 -05:00
mm	powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly	2012-07-11 14:18:22 +10:00
net	powerpc: Start using ___PPC_RA/B/S/T where necessary	2012-07-10 19:18:25 +10:00
oprofile	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
perf	powerpc/perf: Use perf_instruction_pointer in callchains	2012-07-10 19:18:46 +10:00
platforms	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
sysdev	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
xmon	powerpc/xmon: Use cpumask iterator to avoid warning	2012-07-02 14:30:11 +10:00
Kconfig	powerpc: select PPC_CLOCK unconditionally for FSL_SOC	2012-07-10 07:08:58 -05:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	crypto: nx - move nx build to driver/crypto Makefile	2012-06-27 14:42:00 +08:00
relocs_check.pl	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00