summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [IPV4]: reset IPCB flags when neccessaryPatrick McHardy2006-01-074-5/+7
* [IPV4/6]: Netfilter IPsec input hooksPatrick McHardy2006-01-074-1/+47
* [IPV6]: Move nextheader offset to the IP6CBPatrick McHardy2006-01-0714-46/+42
* [XFRM]: Netfilter IPsec output hooksPatrick McHardy2006-01-074-70/+148
* [XFRM]: Fix sparse warning.Luiz Capitulino2006-01-071-1/+1
* [DCCP]: ipv6.c needs net/ip6_checksum.cDavid S. Miller2006-01-071-0/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2006-01-0722-616/+1028
|\
| * Input: ibmasm - convert to dynamic input_dev allocationVernon Mauery2006-01-072-34/+48
| * Input: i8042 - add OQO Zepto to noloop dmi table.Ben Collins2006-01-051-0/+8
| * Input: add missing keys from input.h to hid-debug.hMichael Hanselmann2006-01-051-1/+15
| * Input: atkbd - don't lose keymap settings when reconnecting keyboardDmitry Torokhov2006-01-051-1/+1
| * Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Dmitry Torokhov2006-01-051443-50909/+93554
| |\
| * | Input: wistron - convert to the new platform device interfaceDmitry Torokhov2005-12-281-46/+68
| * | Input: maceps2 - convert to the new platform device interfaceDmitry Torokhov2005-12-281-16/+52
| * | Input: q40kbd - convert to the new platform device interfaceDmitry Torokhov2005-12-281-32/+57
| * | Input: ct82c710 - convert to the new platform device interfaceDmitry Torokhov2005-12-281-26/+63
| * | Input: i8042 - convert to the new platform device interfaceDmitry Torokhov2005-12-281-49/+67
| * | Input: logips2pp - add signature of MouseMan Wheel Mouse (87)Dmitry Torokhov2005-12-211-0/+1
| * | Input: sparcspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-57/+105
| * | Input: m68kspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-17/+85
| * | Input: pcspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-6/+80
| * | Input: lifebook - add DMI signature of Fujitsu Lifebook B142Daniele Gozzi2005-12-211-0/+7
| * | Input: add help entry for FM801 gameport driver to KconfigDmitry Torokhov2005-12-211-0/+7
| * | Input: i8042 - disable MUX mode for Sharp MM20Dmitry Torokhov2005-12-211-0/+7
| * | Input: psmouse - don't leave mouse asleepDmitry Torokhov2005-12-211-9/+6
| * | Input: ALPS - add signature for HP ze1115Larry Finger2005-12-211-0/+1
| * | Input: appletouch - add support for Geyser 2Michael Hanselmann2005-12-212-38/+112
| * | Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)Dmitry Torokhov2005-12-20390-5617/+6063
| |\ \
| * | | Input: add the fn key to hid-debug.hMichael Hanselmann2005-12-111-0/+1
| * | | Input: wistron - add Acer TravelMate 240 to DMI tableAshutosh Naik2005-12-111-0/+19
| * | | Input: logips2pp - add new signature (85)Jasper Spaans2005-12-111-0/+1
| * | | Input: mousedev - make module parameters visible in sysfsDmitry Torokhov2005-12-111-5/+5
| * | | Input: evdev - consolidate compat and regular codeDmitry Torokhov2005-12-111-280/+213
* | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-01-07172-1791/+1906
|\ \ \ \
| * | | | [ARM] byteorder.h needs linux/compiler.hRussell King2006-01-071-0/+1
| * | | | [ARM] Move asm/hardware/clock.h to linux/clk.hRussell King2006-01-0734-38/+36
| * | | | [ARM] Move AMBA bus code to drivers/amba/Russell King2006-01-074-1/+3
| * | | | Merge with Linus' kernel.Russell King2006-01-072145-64681/+159271
| |\ \ \ \
| * | | | | [ARM] Move AMBA include files to include/linux/amba/Russell King2006-01-0728-35/+35
| * | | | | [ARM] 3239/1: Add ARM optimised swab32Andre McCurdy2006-01-071-1/+14
| * | | | | [ARM] 3235/1: SharpSL PM: Fix a gcc4 build errorRichard Purdie2006-01-074-3/+1
| * | | | | [ARM] 3232/1: i.MX Frame Buffer undeclared "dev" variable fixPavel Pisa2006-01-071-3/+3
| * | | | | [ARM] 3206/1: Modifications to the bus arbiter controller for the Intel PXA27xJared Hulbert2006-01-052-0/+18
| * | | | | [ARM] 3226/1: IXP4xx runtime expansion bus window size configurationDeepak Saxena2006-01-0511-46/+53
| * | | | | [ARM] 3217/1: iop331 uarts as platform devicesDan Williams2006-01-051-26/+68
| * | | | | [ARM] 3231/1: mx1ads board support cleanupSascha Hauer2006-01-051-45/+10
| * | | | | [ARM] 3230/1: Sharp Scoop: Fix Shared Power Control IssuesRichard Purdie2006-01-053-14/+16
| * | | | | [ARM] 3229/1: Remove uneeded ARM apm dependency on PM_LEGACYRichard Purdie2006-01-052-13/+7
| * | | | | [ARM] 3228/1: SharpSL: Move PM code to arch/arm/commonRichard Purdie2006-01-0510-941/+1016
| * | | | | [ARM] 3227/1: Spitz: Add pxa27x OHCI platform specific codeRichard Purdie2006-01-051-0/+31