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
..
act2000
capi	drivers/isdn: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required.	2011-10-31 19:31:49 -04:00
divert	isdn: make sure strings are null terminated	2011-11-29 18:39:36 -05:00
gigaset	isdn/gigaset: report ISDN4Linux interface only once	2011-11-27 17:08:30 -05:00
hardware	USB: convert some miscellanies drivers to use module_usb_driver()	2011-11-18 09:52:10 -08:00
hisax	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
hysdn
i4l	isdn: avoid copying too long drvid	2011-11-29 18:39:37 -05:00
icn
isdnloop
mISDN	drivers/isdn: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required.	2011-10-31 19:31:49 -04:00
pcbit
sc
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Makefile