]> err.no Git - linux-2.6/commit
Pull miscellaneous into release branch
authorTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 17 Apr 2008 17:14:51 +0000 (10:14 -0700)
commit71b264f85ff50c14fe945ffff06ae0d5e9a9124e
tree9fd79c63fd630c4d030a97d254d42a3a73f1328b
parentf4df39cbdd9e9ab615e80148cc271db22a8508ad
parent072f042df335d7e0da2027637bcf720d7ff1589b
Pull miscellaneous into release branch

Conflicts:

arch/ia64/kernel/mca.c
arch/ia64/Kconfig
arch/ia64/kernel/asm-offsets.c
arch/ia64/kernel/fsys.S
arch/ia64/kernel/mca.c
arch/ia64/kernel/setup.c
arch/ia64/mm/discontig.c