]> bbs.cooldavid.org Git - net-next-2.6.git/commit
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff8b16d ed35f65)
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Nov 2010 14:54:40 +0000 (07:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Nov 2010 14:54:40 +0000 (07:54 -0700)
commit9a8a0caddec7f77174a33e53f5ee9e87181b6232
tree01b63361ff4ecab67a5f3114298df494ebf143cftree | snapshot (tar.bz2 tar.gz zip)
parentff8b16d7e15a8ba2a6086645614a483e048e3fbfcommit | diff
parented35f654e4f0e08d39036353cc1dfda52a5cf129commit | diff
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
  m68knommu: add back in declaration of do_IRQ
Clone of davem's net-next-2.6 tree