projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff8b16d
ed35f65
)
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 5 Nov 2010 14:54:40 +0000
(07:54 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 5 Nov 2010 14:54:40 +0000
(07:54 -0700)
* '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
Trivial merge