projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f5a2c5
6ee4e28
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Sat, 27 Oct 2007 17:11:12 +0000
(10:11 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Sat, 27 Oct 2007 17:11:12 +0000
(10:11 -0700)
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Fix build-warning in io-unit.c
[SPARC64]: Fix BACKOFF_SPIN on non-SMP.
[SPARC32]: __inline__ --> inline
[SPARC64]: __inline__ --> inline
Trivial merge