summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2007-04-3027-273/+641
|\
| * [IPV4] SNMP: Support OutMcastPkts and OutBcastPktsMitsuru Chinen2007-04-301-0/+6
| * [IPV4] SNMP: Support InMcastPkts and InBcastPktsMitsuru Chinen2007-04-301-0/+7
| * [IPV4] SNMP: Support InTruncatedPktsMitsuru Chinen2007-04-301-1/+4
| * [IPV4] SNMP: Support InNoRoutesMitsuru Chinen2007-04-301-0/+2
| * [SNMP]: Add definitions for {In,Out}BcastPktsMitsuru Chinen2007-04-301-0/+2
| * [TCP] FRTO: RFC4138 allows Nagle override when new data must be sentIlpo Järvinen2007-04-303-7/+17
| * [TCP] FRTO: Delay skb available check until it's mandatoryIlpo Järvinen2007-04-301-8/+11
| * [XFRM]: Restrict upper layer information by bundle.Masahide NAKAMURA2007-04-303-0/+71
| * [TCP]: Catch skb with S+L bugs earlierIlpo Järvinen2007-04-301-3/+1
| * [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algoEric Dumazet2007-04-301-57/+114
| * [L2TP]: Add the ability to autoload a pppox protocol module.James Chapman2007-04-301-0/+8
| * [SKB]: Introduce skb_queue_walk_safe()James Chapman2007-04-301-0/+5
| * [AF_IUCV/IUCV]: smp_call_function deadlockMartin Schwidefsky2007-04-282-74/+133
| * [IPV6]: Fix slab corruption running ip6sicEric Sesterhenn2007-04-281-1/+1
| * [TCP]: Update references in two old commentsGerrit Renker2007-04-282-9/+7
| * [XFRM]: Export SPD infoJamal Hadi Salim2007-04-284-1/+140
| * [IPV6]: Track device renames in snmp6.Stephen Hemminger2007-04-282-2/+5
| * [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.Vlad Yasevich2007-04-281-36/+60
| * [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.Rusty Russell2007-04-285-65/+45
| * [NETPOLL]: Remove CONFIG_NETPOLL_RXSergei Shtylyov2007-04-281-5/+0
| * [NETPOLL]: Fix TX queue overflow in trapped mode.Sergei Shtylyov2007-04-281-5/+3
* | Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2007-04-3010-464/+459
|\ \
| * \ Merge branch 'cfq' into for-linusJens Axboe2007-04-303-416/+439
| |\ \
| | * | cfq-iosched: speedup cic rb lookupJens Axboe2007-04-301-2/+18
| | * | ll_rw_blk: add io_context private pointerJens Axboe2007-04-302-0/+2
| | * | cfq-iosched: get rid of cfqq hashVasily Tarasov2007-04-301-100/+67
| | * | cfq-iosched: tighten queue request overlap conditionJens Axboe2007-04-301-1/+2
| | * | cfq-iosched: improve sync vs async workloadsJens Axboe2007-04-301-13/+18
| | * | cfq-iosched: never allow an async queue idlingJens Axboe2007-04-301-1/+6
| | * | cfq-iosched: get rid of ->dispatch_sliceJens Axboe2007-04-301-5/+1
| | * | cfq-iosched: don't pass unused preemption variable aroundJens Axboe2007-04-301-15/+13
| | * | cfq-iosched: get rid of ->cur_rr and ->cfq_listJens Axboe2007-04-301-55/+32
| | * | cfq-iosched: slice offset should take ioprio into accountJens Axboe2007-04-301-1/+2
| | * | [PATCH] cfq-iosched: style cleanups and commentsJens Axboe2007-04-301-16/+50
| | * | cfq-iosched: sort IDLE queues into the rbtreeJens Axboe2007-04-301-36/+31
| | * | cfq-iosched: sort RT queues into the rbtreeJens Axboe2007-04-301-15/+12
| | * | [PATCH] cfq-iosched: speed up rbtree handlingJens Axboe2007-04-301-14/+48
| | * | cfq-iosched: rework the whole round-robin list conceptJens Axboe2007-04-301-238/+123
| | * | cfq-iosched: minor updatesJens Axboe2007-04-301-63/+18
| | * | cfq-iosched: development updateJens Axboe2007-04-301-120/+261
| | * | cfq-iosched: improve preemption for cooperating tasksJens Axboe2007-04-301-6/+20
| | |/
| * | [PATCH] elevator: elv_list_lock does not need irq disablingJens Axboe2007-04-301-8/+9
| * | [BLOCK] Don't pin lots of memory in mempoolsJens Axboe2007-04-306-40/+11
| |/
* | Merge branch 'for-2.6.22' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Linus Torvalds2007-04-30376-7892/+11546
|\ \
| * | [POWERPC] Remove dev_dbg redefinition in drivers/ps3/vuart.cPaul Mackerras2007-04-301-8/+0
| * | Merge branch 'linux-2.6' into for-2.6.22Paul Mackerras2007-04-301949-76186/+101007
| |\|
| * | [POWERPC] remove kernel module option for booke wdtDave Jiang2007-04-301-1/+1
| * | [POWERPC] Avoid putting cpu node twiceJohn Rigby2007-04-301-2/+4
| * | [POWERPC] Spinlock initializer cleanupThomas Gleixner2007-04-304-4/+4