]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ffaba67 81f1adf)
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)
commited223129a30de7d244ca9b59819f5532c9caf039
tree9ea5649276c18f13356c4db1663368e071081a25tree | snapshot
parentffaba674090f287afe0c44fd8d978c64c03581a8commit | diff
parent81f1adf01224f5c0be5f90f43664f799c1f7bb2dcommit | diff
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 diff1 | diff2 | blob | history
arch/sparc/kernel/smp_64.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.