1. 09 Mar, 2007 36 commits
  2. 07 Mar, 2007 4 commits
    • Linus Torvalds's avatar
      Linux 2.6.21-rc3 · 08e15e81
      Linus Torvalds authored
      .. hopefully most of the resume/suspend problems introduced by the timer
      and other changes are behind us.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      08e15e81
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 2f774456
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Fix floppy build failure.
      2f774456
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 5b3c1184
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [DCCP]: Set RTO for newly created child socket
        [DCCP]: Correctly split CCID half connections
        [NET]: Fix compat_sock_common_getsockopt typo.
        [NET]: Revert incorrect accept queue backlog changes.
        [INET]: twcal_jiffie should be unsigned long, not int
        [GIANFAR]: Fix compile error in latest git
        [PPPOE]: Use ifindex instead of device pointer in key lookups.
        [NETFILTER]: ip6_route_me_harder should take into account mark
        [NETFILTER]: nfnetlink_log: fix reference counting
        [NETFILTER]: nfnetlink_log: fix module reference counting
        [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix NULL pointer dereference
        [NETFILTER]: nfnetlink_log: fix use after free
        [NETFILTER]: nfnetlink_log: fix reference leak
        [NETFILTER]: tcp conntrack: accept SYN|URG as valid
        [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs
        [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops
      5b3c1184
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · fe1b4ba4
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] cio: Call cancel_halt_clear even when actl == 0.
        [S390] cio: Use path verification to check for path state.
        [S390] cio: Fix locking when calling notify function.
        [S390] Fixed handling of access register mode faults.
        [S390] dasd: Use default recovery for SNSS requests
        [S390] check_bugs() should be inline.
        [S390] tape: Compression overwrites crypto setting
        [S390] nss: disable kexec.
        [S390] reipl: move dump_prefix_page out of text section.
        [S390] smp: disable preemption in smp_call_function/smp_call_function_on
        [S390] kprobes breaks BUG_ON
      fe1b4ba4