]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
commit09b3b59db3924ea0b160dee9fa3f6a42eb5eb4c3
tree2be09ae1777d580c7dfe05d6d5b76e57281ec447
parent8b20fa3fb6fd85ed7660df7d91b8ae377acbfd46
parent47f5141d4c428db147fb6af4c79eba742806252c
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
arch/sparc/Kconfig
arch/sparc/Kconfig
arch/sparc/kernel/Makefile
arch/sparc/kernel/ioport.c
arch/sparc/kernel/nmi.c