1. 17 Oct, 2006 37 commits
  2. 16 Oct, 2006 3 commits
    • Geert Uytterhoeven's avatar
      [PATCH] CONFIG_TELCLOCK depends on X86 · 4d99bfac
      Geert Uytterhoeven authored
      
      
      The telecom clock driver for MPBL0010 ATCA SBC depends on X86
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarMark Gross <mark.gross@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4d99bfac
    • Randy Dunlap's avatar
      [PATCH] fix epoll_pwait when EPOLL=n · 39af1143
      Randy Dunlap authored
      Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7371
      
      
      
      sys_epoll_pwait needs to be listed as a conditional (weak)
      entry point for CONFIG_EPOLL=n.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      39af1143
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 5206a79d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
        [Bluetooth] Use work queue to trigger URB submission
        [Bluetooth] Add locking for bt_proto array manipulation
        [Bluetooth] Check if DLC is still attached to the TTY
        [Bluetooth] Fix reference count when connection lookup fails
        [Bluetooth] Disconnect HID interrupt channel first
        [Bluetooth] Support concurrent connect requests
        [Bluetooth] Make use of virtual devices tree
        [Bluetooth] Handle return values from driver core functions
        [Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP
        [IPV6] sit: Add missing MODULE_LICENSE
        [IPV6]: Remove bogus WARN_ON in Proxy-NA handling.
        [IPv6] rules: Use RT6_LOOKUP_F_HAS_SADDR and fix source based selectors
        [XFRM]: Fix xfrm_state_num going negative.
        [NET]: reduce sizeof(struct inet_peer), cleanup, change in peer_check_expire()
        NetLabel: the CIPSOv4 passthrough mapping does not pass categories correctly
        NetLabel: better error handling involving mls_export_cat()
        NetLabel: only deref the CIPSOv4 standard map fields when using standard mapping
        [BRIDGE]: flush forwarding table when device carrier off
        [NETFILTER]: ctnetlink: Remove debugging messages
        [NETFILTER]: Update MAINTAINERS entry
        ...
      5206a79d