| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Dec 28 20:19:47 2008 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sun Dec 28 20:19:47 2008 -0800 |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 [diff] | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: arch/sparc64/kernel/idprom.c