WSL2-Linux-Kernel/arch/m68k
Linus Torvalds 2f9e825d3e Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits)
  block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n
  xen-blkfront: fix missing out label
  blkdev: fix blkdev_issue_zeroout return value
  block: update request stacking methods to support discards
  block: fix missing export of blk_types.h
  writeback: fix bad _bh spinlock nesting
  drbd: revert "delay probes", feature is being re-implemented differently
  drbd: Initialize all members of sync_conf to their defaults [Bugz 315]
  drbd: Disable delay probes for the upcomming release
  writeback: cleanup bdi_register
  writeback: add new tracepoints
  writeback: remove unnecessary init_timer call
  writeback: optimize periodic bdi thread wakeups
  writeback: prevent unnecessary bdi threads wakeups
  writeback: move bdi threads exiting logic to the forker thread
  writeback: restructure bdi forker loop a little
  writeback: move last_active to bdi
  writeback: do not remove bdi from bdi_list
  writeback: simplify bdi code a little
  writeback: do not lose wake-ups in bdi threads
  ...

Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and
drivers/scsi/scsi_error.c as per Jens.
2010-08-10 15:22:42 -07:00
..
amiga m68k: amiga - RTC platform device conversion 2010-05-26 19:51:10 +02:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
bvme6000 m68k: Remove BKL from rtc implementations 2010-05-17 21:15:39 +02:00
configs mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
fpsp040 m68k: fix trigraph ignored warning in setox.S 2008-12-28 20:00:05 +01:00
hp300 m68k: hp300 - Checkpatch cleanup 2010-05-17 21:15:40 +02:00
ifpsp060 tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
include/asm Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
kernel Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-05-19 17:10:06 -07:00
lib Stringify support commas 2008-07-20 17:24:38 -07:00
mac m68k/mac: Fix RTC on PMU machines 2010-08-09 21:14:08 +02:00
math-emu locking, m68k/asm-offsets: Rename signal defines 2009-09-01 09:38:03 +02:00
mm m68k: invoke oom-killer from page fault 2010-05-17 21:37:39 +02:00
mvme16x m68k: Remove BKL from rtc implementations 2010-05-17 21:15:39 +02:00
mvme147 m68k: mvme147 core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
q40 m68k: Remove trailing spaces in messages 2010-05-17 21:15:40 +02:00
sun3 arch/m68k/sun3/leds.c: Checkpatch cleanup 2010-08-09 21:14:07 +02:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
Kconfig time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
Kconfig.debug Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line 2010-08-03 14:09:45 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00