| commit | 492559af235eb56884d62553f191c0b5c4def990 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 17 11:31:57 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Jul 17 11:31:57 2007 -0700 |
| tree | a5dfa19243b3b8b976e9f5b9c788cafcd3ad80c7 | |
| parent | d3676756968eef4a31da11be5addc4eec1b6db2c [diff] | |
| parent | 4f8de2745629330d78776282ea490fece22ee5e4 [diff] |
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