projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd60ae4
e44e41d
)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
author
Linus Torvalds
<
[email protected]
>
Thu, 3 Aug 2006 19:50:20 +0000
(12:50 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 3 Aug 2006 19:50:20 +0000
(12:50 -0700)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEM
[IA64] align high endpoint of VIRTUAL_MEM_MAP
[PATCH] Fix RAID5 + IA64 compile
[IA64] Don't alloc empty frame in ia64_switch_mode_phys
[IA64] Do not assume output registers be reservered.
[IA64] add platform check to snsc driver init
[IA64] sparse cleanups
[IA64] Fix breakage in simscsi.c
[IA64] Format /proc/pal/*/version_info correctly
1
2
arch/ia64/kernel/palinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/ia64/kernel/palinfo.c
Simple merge