From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Jul 2007 18:31:57 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.23-rc1~521
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=492559af235eb56884d62553f191c0b5c4def990;p=linux-2.6

Merge branch 'release' of git://git.kernel.org/pub/scm/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
---

492559af235eb56884d62553f191c0b5c4def990