]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5d2782110cd47c6ef0d2aed30422dffdc21d3594
tree5ac6f43899648abeab1d43aad3107f664e7f13d5
parent1f37ffdcb6715c74762248cb1617e0e4c90428cb
parentcd1674be1c6fec97dcd4b461fa69d5dbb03c9cee
Merge branch 'linus' into cpus4096-for-linus

Conflicts:

net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
net/core/dev.c
net/iucv/iucv.c
net/sunrpc/svc.c