]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:34:07 +0000 (15:34 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 3 Oct 2007 22:34:07 +0000 (15:34 -0700)
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: fix PORT_J BUG for BF537/6 EMAC driver reported by Kalle Pokki <kalle.pokki@iki.fi>
  Blackfin arch: gpio pinmux and resource allocation API required by BF537 on chip ethernet mac driver
  Blackfin arch: add some missing syscall
  binfmt_flat: checkpatch fixing minimum support for the blackfin relocations
  Binfmt_flat: Add minimum support for the Blackfin relocations


Trivial merge