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
..
agp	agp: iommu_gfx_mapped only available if CONFIG_INTEL_IOMMU is set	2011-11-08 10:50:27 +00:00
hw_random	hwrng: nomadik: Enable module alias autogeneration for AMBA drivers	2011-11-22 10:58:30 +00:00
ipmi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
mwave	Fix common misspellings	2011-03-31 11:26:23 -03:00
pcmcia	pcmcia: Convert pcmcia_device_id declarations to const	2011-05-06 07:46:22 +02:00
tpm	Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security	2011-10-25 09:45:31 +02:00
xilinx_hwicap	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-10-25 12:11:02 +02:00
applicom.c
applicom.h
bfin-otp.c
briq_panel.c
bsr.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
generic_nvram.c	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
genrtc.c
hangcheck-timer.c
hpet.c	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:05:15 -07:00
i8k.c	i8k: Integrate with the hwmon subsystem	2011-05-25 20:43:33 +02:00
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
lp.c
Makefile	arch/tile: add hypervisor-based character driver for SPI flash ROM	2011-06-10 13:07:48 -04:00
mbcs.c
mbcs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
mem.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
misc.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
mmtimer.c	posix-timers: Cleanup namespace	2011-02-02 15:28:19 +01:00
msm_smd_pkt.c	drivers/char/msm_smd_pkt.c: don't use IS_ERR()	2011-08-25 16:25:33 -07:00
mspec.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
nsc_gpio.c
nvram.c	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
nwbutton.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c	drivers/char/ppdev.c: put gotten port value	2011-05-26 17:12:37 -07:00
ps3flash.c	drivers/char: Add module.h to those who were using it implicitly	2011-10-31 19:31:40 -04:00
ramoops.c	drivers/char: Fix implicit use of err.h in ramoops.c	2011-10-31 19:31:42 -04:00
random.c	random: Use arch_get_random_int instead of cycle counter if avail	2011-12-29 16:49:45 -08:00
raw.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
rtc.c	drivers/char/rtc: use printk_ratelimited instead of printk_ratelimit	2011-09-15 14:05:25 +02:00
scx200_gpio.c
snsc_event.c
snsc.c
snsc.h	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sonypi.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
tb0219.c
tile-srom.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
tlclk.c
toshiba.c
ttyprintk.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
uv_mmtimer.c
viotape.c
virtio_console.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00