summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge nommu treeRussell King2006-04-262-2/+4
|\
| * [ARM] nommu: trivial fixups for head-nommu.S and the MakefileHyok S. Choi2006-04-242-2/+4
* | [ARM] vfp: fix leak of VFP_NAN_FLAG into FPSCRRussell King2006-04-253-3/+3
* | [ARM] 3484/1: Correct AEABI CFLAGS for correct enum handlingRichard Purdie2006-04-251-1/+1
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stableLinus Torvalds2006-04-251-1/+4
|\ \
| * | [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefinedSteve French2006-04-241-1/+4
| |/
* | [NETFILTER]: ipt action: use xt_check_target for basic verificationPatrick McHardy2006-04-251-0/+5
* | [NETFILTER]: x_tables: move table->lock initializationDmitry Mishin2006-04-251-1/+1
* | [NETFILTER]: ip6_tables: remove broken comefrom debuggingPatrick McHardy2006-04-251-13/+0
* | [NETFILTER]: nf_conntrack: kill unused callback init_conntrackYasuyuki Kozakai2006-04-251-3/+0
* | [NETFILTER]: Fix compat_xt_counters alignment for non-x86Patrick McHardy2006-04-251-0/+4
* | [NETFILTER]: ULOG target is not obsoleteThomas Voegtle2006-04-251-1/+1
* | [NETFILTER]: nf_conntrack: Fix module refcount dropping too farYasuyuki Kozakai2006-04-252-9/+4
* | [SPARC]: __NR_sys removalOGAWA Hirofumi2006-04-242-2/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6Linus Torvalds2006-04-2326-465/+735
|\
| * [PARISC] MAINTAINERSKyle McMartin2006-04-221-0/+4
| * [PARISC] Make ioremap default to _nocacheKyle McMartin2006-04-221-12/+5
| * [PARISC] Add new entries to the syscall tableKyle McMartin2006-04-223-2/+22
| * [PARISC] Further work for multiple page sizesHelge Deller2006-04-2211-102/+198
| * [PARISC] Fix up hil_kbd.c mismergeMatthew Wilcox2006-04-221-1/+1
| * [PARISC] defconfig updatesHelge Deller2006-04-221-179/+315
| * [PARISC] Document that we tolerate "Relaxed Ordering"Grant Grundler2006-04-221-13/+32
| * [PARISC] Misc. janitorial workHelge Deller2006-04-224-6/+6
| * [PARISC] EISA regions must be mapped NO_CACHEHelge Deller2006-04-221-1/+2
| * [PARISC] OSS ad1889: Match register names with ALSA driverStuart Brady2006-04-222-149/+150
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-04-234-17/+20
|\ \
| * | [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cardsDaniel Ritz2006-04-221-4/+11
| * | [PATCH] vrc4171: update configYoichi Yuasa2006-04-221-1/+1
| * | [PATCH] pcmcia: fix oops in static mapping caseDominik Brodowski2006-04-221-1/+0
| * | [PATCH] pcmcia: remove unneeded forward declarationsAndrew Morton2006-04-221-6/+2
| * | [PATCH] pcmcia: do not set dev_node to NULL too earlyDominik Brodowski2006-04-222-2/+2
| * | [PATCH] pcmcia: fix comment for pcmcia_load_firmwareKomuro2006-04-221-2/+2
| * | [PATCH] pcmcia: unload second device firstKomuro2006-04-221-1/+1
| * | [PATCH] pcmcia: add new ID to pcnet_csDominik Brodowski2006-04-221-0/+1
| |/
* | Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2006-04-235-10/+2
|\ \
| * | drm: possible cleanupsDave Airlie2006-04-234-9/+1
| * | drm: fixup r300 scratch on BE machinesDave Airlie2006-04-231-1/+1
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stableLinus Torvalds2006-04-2313-115/+138
|\ \ \
| * | | [CIFS] Fix typo in previousSteve French2006-04-231-1/+1
| * | | [CIFS] Readdir fixes to allow search to start at arbitrary positionSteve French2006-04-227-36/+74
| * | | [CIFS] Use the kthread_ API instead of opencoding lots of hairy code for kernelSteve French2006-04-221-49/+50
| * | | [CIFS] Don't allow a backslash in a path componentSteve French2006-04-211-0/+14
| * | | [CIFS] [CIFS] Do not take rename sem on most path based calls (duringSteve French2006-04-217-30/+0
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-04-2321-169/+231
|\ \ \
| * | | powerpc: Fix define_machine so machine_is() works from modulesPaul Mackerras2006-04-231-1/+5
| * | | Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe...Paul Mackerras2006-04-222-0/+2
| |\ \ \
| | * \ \ Merge branch 'master'Kumar Gala2006-04-04556-9326/+48607
| | |\ \ \
| | * | | | powerpc/ppc: export strncasecmpKumar Gala2006-04-022-0/+2
| * | | | | [PATCH] powerpc: fix oops in alsa powermac driverBenjamin Herrenschmidt2006-04-214-6/+6
| * | | | | [PATCH] powerpc: update {g5,iseries,pseries}_defconfigsWill Schmidt2006-04-213-76/+79