]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2008 15:17:58 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2008 15:17:58 +0000 (08:17 -0700)
commit8bec4a5d9305c86d028a519b08f05b81cd63cc55
tree43abefe9f8ffd7b592239d39a93e473d697eb1e0
parent886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a
parentf8e811b98935f702b48abc92563462a15c226eb8
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] fix file and descriptor handling in perfmon
  [IA64] TS_RESTORE_SIGMASK
  [IA64] smp.c coding style fix
  [IA64] fix section mismatch in arch/ia64/kernel/topology.c
  [IA64] fix section mismatch in arch/ia64/kernel/palinfo.c
  [IA64] fix section mismatch in arch/ia64/kernel/irq.c
  [IA64] fix section mismatch in arch/ia64/kernel/acpi.c