linux/arch/blackfin
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
..
boot Blackfin: add support for LZO compressed kernels 2010-08-06 12:55:53 -04:00
configs Blackfin: update defconfigs 2010-08-06 12:55:58 -04: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 Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
lib Blackfin: optimize strncpy a bit 2010-05-22 14:19:11 -04:00
mach-bf518 Blackfin: unify rotary encoder bitmasks 2010-08-06 12:55:56 -04:00
mach-bf527 Blackfin: unify rotary encoder bitmasks 2010-08-06 12:55:56 -04:00
mach-bf533 Blackfin: gpio/portmux: clean up whitespace corruption 2010-08-06 12:55:51 -04:00
mach-bf537 Blackfin: TWI: clean up the MMR names 2010-08-06 12:55:55 -04:00
mach-bf538 Blackfin: TWI: clean up the MMR names 2010-08-06 12:55:55 -04:00
mach-bf548 Blackfin: unify rotary encoder bitmasks 2010-08-06 12:55:56 -04:00
mach-bf561 Blackfin: gpio/portmux: clean up whitespace corruption 2010-08-06 12:55:51 -04:00
mach-common Blackfin: dpmc: punt unnecessary RTC_ISTAT clearing 2010-08-06 12:55:57 -04:00
mm Blackfin: use atomic kmalloc in L1 alloc so it too can be atomic 2010-05-22 14:19:12 -04:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
ADI_BSD.txt Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2010-08-09 21:01:11 -07:00
Kconfig.debug Blackfin: allow NMI watchdog to be used w/RETN as a scratch reg 2010-05-22 14:19:04 -04:00
Makefile Blackfin: add support for LZO compressed kernels 2010-08-06 12:55:53 -04:00