diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 18:39:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 18:39:30 -0400 |
| commit | 98d86c091534f35c4bab294451ae6bccab8e9075 (patch) | |
| tree | 98c9f0b80bb078405cf173f1d5cc91c72e77082d /arch/sparc/include/asm/asmmacro.h | |
| 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
Diffstat (limited to 'arch/sparc/include/asm/asmmacro.h')
0 files changed, 0 insertions, 0 deletions