Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 16:37:09 +0000 (08:37 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 16:37:09 +0000 (08:37 -0800)
commit8cc91677ae027e15654d7d86a735a7ab6f5c2ec1
tree68298494c949f14e4cc67b64a43579e7297112ca
parentd32ddd8f20e7d7a49c45c337c2079be03c77dc41
parent597702aeb492fcb8e1b48283e1450df40e928ba0
Merge branch 'for-linus' of git://git./linux/kernel/git/hskinnemoen/avr32-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  [AVR32] Export intc_get_pending symbol
  [AVR32] Add missing bit in PCCR sysreg
  [AVR32] Fix duplicate clock index in at32ap machine code
  [AVR32] remove UID16 option
  [AVR32] Turn off debugging in SMC driver
  Extend I/O resource for wdt0 for at32ap7000 devices
  [AVR32] pcmcia ioaddr_t should be 32 bits on AVR32