Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
commit492559af235eb56884d62553f191c0b5c4def990
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 18:31:57 +0000 (17 11:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 18:31:57 +0000 (17 11:31 -0700)
treea5dfa19243b3b8b976e9f5b9c788cafcd3ad80c7
parentd3676756968eef4a31da11be5addc4eec1b6db2c
parent4f8de2745629330d78776282ea490fece22ee5e4
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Clean away some code inside some non-existent CONFIG ifdefs
  [IA64] ar.itc access must really be after xtime_lock.sequence has been read
  [IA64] correctly count CPU objects in the ia64/sn hwperf interface
  [IA64] arbitary speed tty ioctl support
  [IA64] use machvec=dig on hpzx1 platforms