summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-08-199-6/+55
|\
| * Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Greg Kroah-Hartman2006-08-182-0/+32
| |\
| | * [BRIDGE]: Disable SG/GSO if TX checksum is offHerbert Xu2006-08-171-0/+3
| | * [VLAN]: Make sure bonding packet drop checks get done in hwaccel RX path.David S. Miller2006-08-172-0/+29
| * | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/...Greg Kroah-Hartman2006-08-182-2/+2
| |\ \ | | |/ | |/|
| | * [POWERPC] Make crash.c work on 32-bit and 64-bitMichael Ellerman2006-08-171-2/+1
| | * [POWERPC] Fix might-sleep warning on removing cpusHaren Myneni2006-08-081-0/+1
| * | [PATCH] fuse: fix error case in fuse_readpagesAlexander Zarochentsev2006-08-141-0/+1
| * | [PATCH] fbdev: include backlight.h only when __KERNEL__ is definedMichal Januszewski2006-08-141-1/+1
| * | [INET]: Use pskb_trim_unique when trimming paged unique skbsHerbert Xu2006-08-131-0/+15
| * | pr_debug() should not be used in driversPavel Machek2006-08-111-0/+1
| * | Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Greg Kroah-Hartman2006-08-091-2/+2
| |\ \
| | * | [NET]: Fix alloc_skb comment typoChristoph Hellwig2006-08-071-2/+2
| | |/
| * / V4L/DVB (4340): Videodev.h should be included also when V4L1_COMPAT is selected.Mauro Carvalho Chehab2006-08-081-1/+1
| |/
* | Merge branch 'master' into upstreamJeff Garzik2006-08-078-13/+40
|\|
| * Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/...Linus Torvalds2006-08-061-2/+22
| |\
| | * Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 in...Dmitry Torokhov2006-08-04216-1011/+1804
| | |\
| | * | Input: introduce input_inject_event() functionDmitry Torokhov2006-07-061-0/+1
| | * | Input: add start() method to input handlersDmitry Torokhov2006-07-061-0/+21
| | * | Input: remove accept method from input_devDmitry Torokhov2006-07-061-2/+0
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-08-061-1/+1
| |\ \ \
| | * | | [PKT_SCHED] RED: Fix overflow in calculation of queue averageIlpo Järvinen2006-08-041-1/+1
| | | |/ | | |/|
| * | | [PATCH] debug_locks.h: add "struct task_struct;"Alexey Dobriyan2006-08-061-0/+2
| * | | [PATCH] fix vmstat per cpu usageJan Blunck2006-08-061-4/+4
| * | | [PATCH] Make suspend possible with a traced process at a breakpointRafael J. Wysocki2006-08-061-0/+8
| |/ /
| * | Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2006-08-043-6/+3
| |\ \
| | * | RPC: Ensure that we disconnect TCP socket when client requests error outTrond Myklebust2006-08-031-1/+1
| | * | NLM/lockd: remove b_doneJ. Bruce Fields2006-08-031-1/+0
| | * | NFS: make 2 functions staticAdrian Bunk2006-08-031-4/+2
* | | | Merge branch 'master' into upstreamJeff Garzik2006-08-046-7/+16
|\| | |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6Linus Torvalds2006-08-032-2/+1
| |\ \ \
| | * | | PCI: docking station: remove dock ueventsKristen Carlson Accardi2006-08-031-2/+0
| | * | | PCI: Unhide the SMBus on Asus PU-DLSJean Delvare2006-08-031-0/+1
| | |/ /
| * | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/...Linus Torvalds2006-08-034-5/+15
| |\ \ \ | | |/ / | |/| |
| | * | [IA64] fix show_mem for VIRTUAL_MEM_MAP+FLATMEMBob Picco2006-08-031-1/+6
| | * | [IA64] sparse cleanupsKeith Owens2006-08-022-3/+3
| | * | [IA64] Format /proc/pal/*/version_info correctlyMatthew Wilcox2006-07-311-1/+6
* | | | Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-08-0334-71/+221
|\| | |
| * | | [PATCH] don't bother with aux entires for dummy contextAl Viro2006-08-031-11/+11
| * | | [PATCH] mark context of syscall entered with no rules as dummyAl Viro2006-08-031-0/+6
| * | | [PATCH] introduce audit rules counterAl Viro2006-08-031-0/+2
| * | | [PATCH] fix missed create event for directory auditAmy Griffis2006-08-032-7/+7
| * | | [PATCH] fix faulty inode data collection for open() with O_CREATAmy Griffis2006-08-031-0/+7
| * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-08-0210-22/+140
| |\ \ \
| | * | | [NET]: Fix more per-cpu typosAlexey Dobriyan2006-08-021-1/+1
| | * | | [SECURITY]: Fix build with CONFIG_SECURITY disabled.David S. Miller2006-08-021-1/+0
| | * | | [AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patchCatherine Zhang2006-08-023-14/+62
| | * | | [NET]: skb_queue_lock_key() is no longer used.Adrian Bunk2006-08-021-2/+0
| | * | | [NET]: Remove lockdep_set_class() call from skb_queue_head_init().Arjan van de Ven2006-08-021-1/+8
| | * | | [NET]: Add netdev_alloc_skb().Christoph Hellwig2006-08-021-0/+22