diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 07:36:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 07:36:23 -0800 |
commit | df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a (patch) | |
tree | 3a08bcba2f61bb4ffaac8dc1127ec6c5815e0563 /include/linux/phonet.h | |
parent | 3350b2acdd39d23db52710045536b943fe38a35c (diff) | |
parent | 8ab1221c20255f35d85664a046549bc6135122c2 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fixup last users of irq_chip->typename
Alpha: Rearrange thread info flags fixing two regressions
arch/alpha/kernel: Add kmalloc NULL tests
arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST
Diffstat (limited to 'include/linux/phonet.h')
0 files changed, 0 insertions, 0 deletions