Merge branch 'linus' into cpus4096-for-linus
authorIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 15:19:50 +0000 (17:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 21 Jul 2008 15:19:50 +0000 (17:19 +0200)
Conflicts:

net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge