tree e2f510a8a54d7d4443cb52f3a0be46f527ebb779
parent 66833d5f3934a19d0988b7d0de58149bfd7a5884
parent d310fb4bb73629840430cb13cb282915e49fef4b
author Linus Torvalds <torvalds@linux-foundation.org> 1219952041 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1219952041 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
  Blackfin arch: sram: use 'unsigned long' for irqflags
  Blackfin arch: let PCI depend on BROKEN
  Blackfin arch: move include/asm-blackfin header files to arch/blackfin
  Blackfin arch: fix bug - MPU crashes under stress
  Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
  Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
  Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK