| commit | 98d86c091534f35c4bab294451ae6bccab8e9075 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Sep 08 15:39:30 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Sep 08 15:39:30 2008 -0700 |
| tree | 98c9f0b80bb078405cf173f1d5cc91c72e77082d | |
| parent | d875a4b0ffad754e6d89fa561ea7dcdd79c9508b [diff] | |
| parent | 4d084617fb0d025c42c242362d1f27d337e2d407 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 Conflicts: arch/sparc/kernel/of_device.c