commit 66b1f1a982bf4dbad9fa0de25b8d95c4936f05c4
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Oct 03 15:34:07 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Oct 03 15:34:07 2007 -0700
tree 277fd9f6ae0ea7aaf34dbbcb5439bc8391068f4e
parent bda0233b89c10ae46ccecb78bffdaf0fd7833d17
parent cda6a20b68c1f21f4b4bc9cd3ee08494e7ebf0d5

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

* '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