]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita9d911c5f45ed49dd14171db54fc87e60a931b88
tree294326663fb757739a98083c2ddd570d1eaf7337
parent0b662dd1f937189b323a3eab6e04d045ac9a7115
parent183459115faa2a47f05e4aabb20d0c9694771c51
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

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