]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...
authorDavid S. Miller <davem@davemloft.net>
Sun, 29 Mar 2009 22:44:22 +0000 (15:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Mar 2009 22:44:22 +0000 (15:44 -0700)
commit009ed309056152d814ef1f1da68ac066eac2961e
tree9ea5649276c18f13356c4db1663368e071081a25
parentc365039fec07f3f6c3edfffa3c7cbafa430eb046
parent5d029bc6bb3eb0cbc1554b6c72f3a4d93e8144f5
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Conflicts:
arch/sparc/kernel/smp_64.c
arch/sparc/kernel/irq_64.c
arch/sparc/kernel/smp_64.c