Linus Torvalds 98793265b4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits) Kconfig: acpi: Fix typo in comment. misc latin1 to utf8 conversions devres: Fix a typo in devm_kfree comment btrfs: free-space-cache.c: remove extra semicolon. fat: Spelling s/obsolate/obsolete/g SCSI, pmcraid: Fix spelling error in a pmcraid_err() call tools/power turbostat: update fields in manpage mac80211: drop spelling fix types.h: fix comment spelling for 'architectures' typo fixes: aera -> area, exntension -> extension devices.txt: Fix typo of 'VMware'. sis900: Fix enum typo 'sis900_rx_bufer_status' decompress_bunzip2: remove invalid vi modeline treewide: Fix comment and string typo 'bufer' hyper-v: Update MAINTAINERS treewide: Fix typos in various parts of the kernel, and fix some comments. clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR gpio: Kconfig: drop unknown symbol 'CS5535_GPIO' leds: Kconfig: Fix typo 'D2NET_V2' sound: Kconfig: drop unknown symbol ARCH_CLPS7500 ... Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new kconfig additions, close to removed commented-out old ones)		2012-01-08 13:21:22 -08:00
..
boot	FRV: Drop 'TOPDIR' from Makefiles	2008-01-28 23:14:37 +01:00
include/asm	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
kernel	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
lib	irq_work: Add generic hardirq context callbacks	2010-10-18 19:58:50 +02:00
mb93090-mb00	mm: stack based kmap_atomic()	2010-10-26 16:52:08 -07:00
mm	frv: remove unnecessary code	2011-07-29 23:41:09 -07:00
defconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Kconfig	treewide: remove commented out Kconfig entries	2011-10-29 21:31:21 +02:00
Kconfig.debug	[PATCH] frv: drop unsupported debugging features	2006-01-08 20:13:36 -08:00
Makefile	frv: clean up arch/frv/Makefile	2010-08-03 14:09:45 +02:00