Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
[linux-2.6] / include / net / netrom.h
2005-09-13  David S. MillerMerge /linux/kernel/git/holtmann/bluetooth-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa-current
2005-09-13  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2005-09-13  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-09-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-12  Ralf Baechle[NETROM]: Introduct stuct nr_private
2005-09-12  Ralf Baechle[NETROM]: Implement G8PZT Circuit reset for NET/ROM
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2