]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
commit1398c9113d6eb195676cbf381a5f15dfe513123e
tree6211a4bdc84690bec6530d27a3abb19f5e8bb8f3
parentf244c3b6c9cd4c3b7b3304c7231e8959ed5bdbec
parent1027e7d6d85d8f300d63d9955443941c35b66d17
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
lib/Kconfig.debug
arch/sparc/kernel/smp_64.c
arch/sparc/kernel/traps_64.c
lib/Kconfig.debug