Linus Torvalds 23d69b09b7 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq ... * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits) usb: don't use flush_scheduled_work() speedtch: don't abuse struct delayed_work media/video: don't use flush_scheduled_work() media/video: explicitly flush request_module work ioc4: use static work_struct for ioc4_load_modules() init: don't call flush_scheduled_work() from do_initcalls() s390: don't use flush_scheduled_work() rtc: don't use flush_scheduled_work() mmc: update workqueue usages mfd: update workqueue usages dvb: don't use flush_scheduled_work() leds-wm8350: don't use flush_scheduled_work() mISDN: don't use flush_scheduled_work() macintosh/ams: don't use flush_scheduled_work() vmwgfx: don't use flush_scheduled_work() tpm: don't use flush_scheduled_work() sonypi: don't use flush_scheduled_work() hvsi: don't use flush_scheduled_work() xen: don't use flush_scheduled_work() gdrom: don't use flush_scheduled_work() ... Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c as per Tejun.		2011-01-07 16:58:04 -08:00
..
boards	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
boot	sh: boot kernel with SR.BL set	2010-09-30 09:43:32 +09:00
cchips	sh: hd64461: irq_data conversion.	2010-10-27 15:18:15 +09:00
configs	sh: include Migo-R TS driver in Migo-R defconfig	2011-01-06 17:19:54 +09:00
drivers	Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-01-07 16:58:04 -08:00
include	Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-01-07 14:50:14 -08:00
kernel	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
lib	sh: change to new flag variable	2010-09-23 16:18:18 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	sh: wire up perf alignment and emulation faults.	2010-10-13 06:55:26 +09:00
mm	sh: Assume new page cache pages have dirty dcache lines.	2010-12-01 15:39:51 +09:00
oprofile	sh: oprofile: Make sure the backtrace op is available for timer-fallback.	2010-10-27 17:03:50 +09:00
tools	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
Kconfig	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-01-07 13:16:28 -08:00
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	sh: Remove old early serial console code V2	2009-12-15 12:07:35 +09:00
Makefile	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00