Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:29:05 +0000 (19:29 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:29:05 +0000 (19:29 -0700)
commit6d435365dd49ac5f7fe6f0e757e942875b1d1550
treeeed7fb9d500792c50d27e40a660a274d3124e642
parent0fd56c70334d7899edaee742ae49d9b893951376
parent38f668e8f78c6699c705f7a1f4866ed03a93e4cf
Merge branch 'for-linus' of /linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: use KBUILD_CFLAGS and KBUILD_AFLAGS in Makefile
  Blackfin arch: Javier Herrer writes: fix building when icache and dcache is disabled