Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
agp	Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes	2011-02-24 12:19:43 +10:00
hw_random	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
ipmi	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
mwave	char: change to new flag variable	2011-03-17 14:02:59 +01:00
pcmcia	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
tpm	Revert "TPM: Long default timeout fix"	2011-03-01 13:23:27 -08:00
xilinx_hwicap	dt: xilinx_hwicap: merge platform and of_platform driver bindings	2011-02-28 13:22:43 -07:00
apm-emulation.c
applicom.c	drivers/char/applicom.c: fix information leak to userland	2010-10-27 18:03:14 -07:00
applicom.h
bfin-otp.c
briq_panel.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
bsr.c
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
efirtc.c
generic_nvram.c
genrtc.c
hangcheck-timer.c
hpet.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
i8k.c	Fix gcc 4.5.1 miscompiling drivers/char/i8k.c (again)	2010-11-15 13:27:06 -08:00
Kconfig	tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/	2011-02-22 17:09:33 -08:00
lp.c
Makefile	Merge 2.6.38-rc6 into tty-next	2011-02-24 11:36:31 -08:00
mbcs.c
mbcs.h
mem.c	vfs: introduce FMODE_UNSIGNED_OFFSET for allowing negative f_pos	2010-10-25 21:18:21 -04:00
misc.c
mmtimer.c	posix-timers: Cleanup namespace	2011-02-02 15:28:19 +01:00
mspec.c
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c	drivers/char/ppdev.c: fix information leak to userland	2010-10-27 18:03:14 -07:00
ps3flash.c
ramoops.c	ramoops: fix types, remove typecasts	2011-01-13 08:03:23 -08:00
random.c	random: update interface comments to reflect reality	2011-02-21 22:42:42 +11:00
raw.c	block: make blkdev_get/put() handle exclusive access	2010-11-13 11:55:17 +01:00
rtc.c
scc.h
scx200_gpio.c
snsc_event.c
snsc.c
snsc.h	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
sonypi.c	sonypi: don't use flush_scheduled_work()	2010-12-24 15:59:07 +01:00
tb0219.c
tlclk.c
toshiba.c
ttyprintk.c	tty: now phase out the ioctl file pointer for good	2011-02-17 11:59:56 -08:00
uv_mmtimer.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
viotape.c
virtio_console.c	virtio: console: Don't access vqs if device was unplugged	2011-03-06 10:44:13 -08:00