projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d17821
0f1482f
)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
author
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:30:03 +0000
(21:30 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:30:03 +0000
(21:30 -0700)
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix lh7a40x_udc.c
[ARM] Fix warning in consistent.c
[ARM] Fix warnings in arch/arm/kernel/setup.c
[ARM] Fix ecard.c resource warnings.
[ARM] Fix ISA IRQ resources
[ARM] Fix bad asm instruction in proc-arm925.S
[ARM] More missing proc-macros.S includes
[ARM] 3708/2: fix SMP build after section ioremap changes
Trivial merge