| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 16 14:11:43 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 16 14:11:43 2008 -0700 |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 [diff] | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 Conflicts: arch/sparc64/kernel/pci_psycho.c