summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/sbus.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-25 00:57:43 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-25 00:57:43 +0200
commit9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe (patch)
treeb1797d88eb6ea57e618a68a23b960e4176449926 /drivers/sbus/sbus.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff)
parent[SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok (diff)
downloadlinux-9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe.tar.xz
linux-9e72ea82e62dd714bc11ed29bfe09a7fc8ac24fe.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Mark most of initial bootup asm as .text.init.ref_ok [SPARC32]: Fix bug in sparc optimized memset. [SPARC64]: Update defconfig. [SPARC]: Add missing NOTES section. [SPARC32]: missing exports [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.
Diffstat (limited to 'drivers/sbus/sbus.c')
0 files changed, 0 insertions, 0 deletions