Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 8 May 2006 16:28:35 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 8 May 2006 16:28:35 +0000 (09:28 -0700)
commitabfd3057187812352cd8502c29ca50cd010b3ccc
treec84ff2b16ba38351f5ff461b74d97fe33f1e83c0
parent96b8eaa14a20771997b501a049e418b871bf9def
parent913ed41eb5c948d2f8b5deffd29c2638eceef3d7
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] remove asm-ia64/bitops.h self-inclusion
  [IA64] strcpy returns NULL pointer and not destination pointer