summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* typo fixes: disadvantadge -> disadvantageAdrian Bunk2006-06-302-2/+2
* typo fixes: aquire -> acquireAdrian Bunk2006-06-309-30/+30
* typo fixes: mecanism -> mechanismAdrian Bunk2006-06-308-8/+8
* typo fixes: bandwith -> bandwidthAdrian Bunk2006-06-308-14/+14
* fix a typo in the RTC_CLASS help textAdrian Bunk2006-06-301-1/+1
* smb is no longer maintainedAdrian Bunk2006-06-301-7/+0
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2006-06-3021-97/+131
|\
| * ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()Florin Malita2006-06-301-8/+1
| * ocfs2: clean up some osb fieldsMark Fasheh2006-06-304-42/+4
| * ocfs2: fix init of uuid_net_keyMark Fasheh2006-06-301-1/+1
| * ocfs2: silence a debug printMark Fasheh2006-06-301-1/+1
| * ocfs2: silence ENOENT during lookup of broken linksSunil Mushran2006-06-301-1/+1
| * ocfs2: Cleanup message printsSunil Mushran2006-06-303-18/+20
| * ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookupJoel Becker2006-06-301-7/+22
| * [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() staticAdrian Bunk2006-06-302-4/+6
| * ocfs2: warn the user on a dead timeout mismatchMark Fasheh2006-06-302-0/+21
| * ocfs2: OCFS2_FS must depend on SYSFSAdrian Bunk2006-06-291-1/+1
| * ocfs2: Compile-time disabling of ocfs2 debugging output.Joel Becker2006-06-294-7/+35
| * configfs: Clear up a few extra spaces where there should be TABs.Joel Becker2006-06-292-4/+4
| * configfs: Release memory in configfs_example.Joel Becker2006-06-291-4/+15
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-3089-148/+520
|\ \
| * | [TIPC]: Initial activation message now includes TIPC version numberAllan Stephens2006-06-301-1/+2
| * | [TIPC]: Improve response to requests for node/link informationAllan Stephens2006-06-302-11/+19
| * | [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_bufAllan Stephens2006-06-301-5/+6
| * | [IrDA]: Fix the AU1000 FIR dependenciesAdrian Bunk2006-06-301-1/+1
| * | [IrDA]: Fix RCU lock pairing on error pathJosh Triplett2006-06-301-1/+2
| * | [XFRM]: unexport xfrm_state_mtuAdrian Bunk2006-06-301-2/+0
| * | [NET]: make skb_release_data() staticAdrian Bunk2006-06-303-3/+1
| * | [NETFILTE] ipv4: Fix typo (Bugzilla #6753)Matt LaPlante2006-06-301-1/+1
| * | [IrDA]: MCS7780 usb_driver struct should be staticAdrian Bunk2006-06-301-1/+1
| * | [BNX2]: Turn off link during shutdownMichael Chan2006-06-302-4/+5
| * | [BNX2]: Use dev_kfree_skb() instead of the _irq versionMichael Chan2006-06-301-5/+5
| * | [ATM]: basic sysfs support for ATM devicesRoman Kagan2006-06-307-6/+209
| * | [ATM]: [suni] change suni_init to __devinitChas Williams2006-06-302-2/+2
| * | [ATM]: [iphase] should be __devinit not __initChas Williams2006-06-301-2/+2
| * | [ATM]: [idt77105] should be __devinit not __initChas Williams2006-06-302-2/+2
| * | [BNX2]: Add NETIF_F_TSO_ECNMichael Chan2006-06-301-2/+12
| * | [NET]: Add ECN support for TSOMichael Chan2006-06-307-12/+9
| * | [AF_UNIX]: Datagram getpeersecCatherine Zhang2006-06-3026-3/+90
| * | [NET]: Fix logical error in skb_gso_okHerbert Xu2006-06-301-2/+2
| * | [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000Shuya MAEDA2006-06-301-6/+12
| * | [NET]: Make illegal_highdma more analHerbert Xu2006-06-301-4/+2
| * | [TCP]: Export accept queue len of a TCP listening socket via rx_queueSridhar Samudrala2006-06-303-3/+8
| * | [NETLINK]: Encapsulate eff_cap usage within security framework.Darrel Goeddel2006-06-3012-34/+35
| * | [NET]: Added GSO header verificationHerbert Xu2006-06-3010-27/+59
| * | [NETFILTER]: statistic match: add missing Kconfig help textPatrick McHardy2006-06-301-1/+4
| * | [NETFILTER]: ip_queue/nfnetlink_queue: drop bridge port references when dev d...Patrick McHardy2006-06-302-4/+20
| * | [NETFILTER]: xt_sctp: fix --chunk-types matchingJorge Matias2006-06-301-1/+1
| * | [NETFILTER]: xt_tcpudp: fix double unregistration in error pathYuri Gushin2006-06-301-1/+1
| * | [NETFILTER]: nf_conntrack: Fix undefined references to local_bh_*Yasuyuki Kozakai2006-06-302-0/+3