Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 29 Dec 2008 04:19:47 +0000 (20:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Dec 2008 04:19:47 +0000 (20:19 -0800)
commite3c6d4ee545e427b55882d97d3b663c6411645fe
tree294326663fb757739a98083c2ddd570d1eaf7337
parent5bc053089376217943187ed5153d0d1e5c5085b6
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/sparc64/kernel/idprom.c
Makefile
arch/sparc/kernel/idprom.c
kernel/sysctl.c