summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge by hand (whitespace conflicts in libata.h)James Bottomley2005-11-10744-16446/+49022
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2005-11-0918-30/+352
| |\
| | * [PATCH] ide-floppy: software eject not working with LS-120 driveOndrej Zary2005-11-101-4/+2
| | * [PATCH] siimage: enable interrupts on Adaptec SA-1210 cardJohn W. Linville2005-11-101-0/+9
| | * [PATCH] ide: explain the PCI bus test we do in <asm-i386/ide.h>Alan Cox2005-11-101-0/+6
| | * [PATCH] ide: CS5535 driverJaya Kumar2005-11-094-0/+316
| | * [PATCH] ide: AMD Geode GX/LX supportJordan Crouse2005-11-092-0/+5
| | * [PATCH] ide: ide-scsi fails to call idescsi_check_condition for things like "...Willem Riede2005-11-091-2/+3
| | * [PATCH] ide: possible cleanupsAdrian Bunk2005-11-093-9/+1
| | * [PATCH] ide: move CONFIG_IDE_MAX_HWIFS into linux/ide.hBjorn Helgaas2005-11-094-12/+4
| | * [PATCH] ide: incorrect device link for ide-csHannes Reinecke2005-11-093-3/+6
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-11-0969-486/+11838
| |\ \
| | * | [NETLINK]: Generic netlink familyThomas Graf2005-11-104-1/+785
| | * | [RTNETLINK]: Use generic netlink receive queue processorThomas Graf2005-11-101-70/+5
| | * | [XFRM]: Use generic netlink receive queue processorThomas Graf2005-11-101-56/+5
| | * | [NETLINK]: Generic netlink receive queue processorThomas Graf2005-11-102-0/+97
| | * | [NETLINK]: Make netlink_callback->done() optionalThomas Graf2005-11-105-25/+8
| | * | [NETLINK]: Type-safe netlink messages/attributes interfaceThomas Graf2005-11-104-2/+1229
| | * | [NETFILTER]: Add nf_conntrack subsystem.Yasuyuki Kozakai2005-11-0957-333/+9710
| * | | [PATCH] SUNRPC: don't reencode when looping in call transmit.Trond Myklebust2005-11-091-3/+29
| * | | [PATCH] powerpc: sched fixupsAndrew Morton2005-11-092-1/+2
| * | | [PATCH] optimize activate_task()Chen, Kenneth W2005-11-091-1/+2
| |/ /
| * | Fix AGP compile on non-x86 architecturesLinus Torvalds2005-11-092-6/+4
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6Linus Torvalds2005-11-095-33/+24
| |\ \
| | * | [PATCH] i2c-viapro: Some adjustmentsJean Delvare2005-11-072-17/+16
| | * | [PATCH] hwmon: Fix two w83627hf bugsYuan Mu2005-11-071-12/+4
| | * | [PATCH] i2c: ds1337 BCD conversion fixJames Chapman2005-11-071-2/+2
| | * | [PATCH] i2c: writing-client doc update complementJean Delvare2005-11-071-2/+2
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha...Linus Torvalds2005-11-091-0/+3
| |\ \ \
| | * | | JFS: set i_ctime & i_mtime on target directory when creating linksDave Kleikamp2005-10-311-0/+3
| * | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2005-11-098-72/+92
| |\ \ \ \
| | * | | | [IPV6]: ip6ip6_lock is not unlocked in error path.Ken-ichirou MATSUZAWA2005-11-091-0/+1
| | * | | | [IPV6]: Fix fallout from CONFIG_IPV6_PRIVACYPeter Chubb2005-11-091-1/+2
| | * | | | [NETFILTER] ctnetlink: ICMP_ID is u_int16_t not u_int8_t.Krzysztof Piotr Oledzki2005-11-091-1/+1
| | * | | | [NETFILTER] ctnetlink: Fix oops when no ICMP ID info in messageKrzysztof Piotr Oledzki2005-11-091-1/+2
| | * | | | [NETFILTER] ctnetlink: Add support to identify expectations by ID'sPablo Neira Ayuso2005-11-091-0/+8
| | * | | | [NETFILTER] ctnetlink: propagate error instaed of returning -EPERMPablo Neira Ayuso2005-11-091-1/+1
| | * | | | [NETFILTER] ctnetlink: return -EINVAL if size is wrongPablo Neira Ayuso2005-11-091-1/+1
| | * | | | [NETFILTER]: stop tracking ICMP error at early pointYasuyuki Kozakai2005-11-091-5/+5
| | * | | | [NETFILTER] nfnetlink: only load subsystems if CAP_NET_ADMIN is setHarald Welte2005-11-091-7/+10
| | * | | | [NETFILTER] PPTP helper: fix PNS-PAC expectation call idPhilip Craig2005-11-091-2/+26
| | * | | | [NETFILTER] ctnetlink: get_conntrack can use GFP_KERNELPablo Neira Ayuso2005-11-091-1/+1
| | * | | | [NETFILTER] ctnetlink: kill unused includesPablo Neira Ayuso2005-11-091-3/+0
| | * | | | [NETFILTER] ctnetlink: add module alias to fix autoloadingPablo Neira Ayuso2005-11-091-0/+2
| | * | | | [NETFILTER] ctnetlink: add marking support from userspacePablo Neira Ayuso2005-11-091-0/+10
| | * | | | [NETFILTER] ctnetlink: check if protoinfo is presentPablo Neira Ayuso2005-11-091-0/+5
| | * | | | [NETFILTER] nfnetlink: nfattr_parse() can never fail, make it voidHarald Welte2005-11-094-46/+11
| | * | | | [NETFILTER]: refcount leak of proto when ctnetlink dumping tupleYasuyuki Kozakai2005-11-091-3/+6
| | * | | | [NETFILTER]: packet counter of conntrack is 32bitsYasuyuki Kozakai2005-11-091-1/+1
| | | |_|/ | | |/| |
| * | | | [SPARC] sbus rtc: implement ->compat_ioctlChristoph Hellwig2005-11-092-2/+22
OpenPOWER on IntegriCloud