summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-1636-137/+268
|\
| * decnet: Fix compiler warning in dn_dev.cDavid S. Miller2008-10-161-1/+1
| * IPV6: Fix default gateway criteria wrt. HIGH/LOW preference radv optionPedro Ribeiro2008-10-162-3/+5
| * net/802/fc.c: Fix compilation warningsManish Katiyar2008-10-151-1/+1
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2008-10-1521-32/+67
| |\
| | * rt2x00: fix regression introduced by "mac80211: free up 2 bytes in skb->cb"Felix Fietkau2008-10-151-4/+5
| | * rtl8187: Add USB ID for Belkin F5D7050 with RTL8187B chipFlorent Fourcot2008-10-151-0/+2
| | * p54usb: Device ID updatesChristian Lamparter2008-10-151-1/+2
| | * mac80211: fixme for kernel-docRandy Dunlap2008-10-151-1/+2
| | * ath9k/mac80211: disallow fragmentation in ath9k, report to userspaceJohannes Berg2008-10-152-2/+8
| | * libertas : Remove unused variable warning for "old_channel" from cmd.cManish Katiyar2008-10-151-0/+2
| | * mac80211: Fix scan RX processing oopsJouni Malinen2008-10-151-1/+2
| | * orinoco: fix unsafe locking in spectrum_cs_suspendDavid Kilroy2008-10-151-2/+3
| | * orinoco: fix unsafe locking in orinoco_cs_resumeAndrey Borzenkov2008-10-151-2/+3
| | * cfg80211: fix debugfs error handlingJohannes Berg2008-10-151-1/+4
| | * mac80211: fix debugfs netdev renameJohannes Berg2008-10-151-1/+5
| | * iwlwifi: fix ct kill configuration for 5350Tomas Winkler2008-10-151-3/+3
| | * mac80211: fix HT information element parsingJohannes Berg2008-10-153-11/+6
| | * p54: Fix compilation problem on PPCLarry Finger2008-10-151-1/+0
| | * mac80211: fix debugfs lockupJohannes Berg2008-10-153-1/+18
| | * iwlwifi: fix compilation warning when CONFIG_IWLWIFI_DEBUG is not set.Rami Rosen2008-10-151-1/+1
| | * rtl8187: add device ID 0bda:8198John W. Linville2008-10-151-0/+1
| * | netns: correct mib stats in ip6_route_me_harder()Alexey Dobriyan2008-10-151-3/+3
| * | netns: fix net_generic array leakAlexey Dobriyan2008-10-151-1/+1
| * | Phonet: Simple doc fix.Randy Macleod2008-10-141-2/+2
| * | netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf...Pablo Neira Ayuso2008-10-146-93/+185
| * | netfilter: fix ebtables dependenciesPatrick McHardy2008-10-141-0/+1
| * | netfilter: restore lost #ifdef guarding defrag exceptionPatrick McHardy2008-10-141-1/+2
| |/
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-16193-1140/+10914
|\ \
| * \ Merge branch 'fixes' into for-linusRussell King2008-10-164009-122599/+234935
| |\ \
| | * | [ARM] 5308/1: Fix Viper ISA IRQ handlingMarc Zyngier2008-10-151-11/+43
| | * | [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build errorMike Rapoport2008-10-151-1/+2
| | * | [ARM] 5306/1: pxa: fix build error on CM-X270Mike Rapoport2008-10-151-1/+1
| * | | Merge branch 's3c-move' into develRussell King2008-10-14413-2357/+3559
| |\ \ \
| | * | | [ARM] S3C24XX: Additional include movesBen Dooks2008-10-0846-47/+47
| | * | | [ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*Ben Dooks2008-10-0778-171/+174
| * | | | Merge branch 'omap-all' into develRussell King2008-10-14104-908/+10646
| |\ \ \ \
| | * | | | [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflictTony Lindgren2008-10-141-10/+1
| | * | | | [ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary checkTony Lindgren2008-10-141-7/+0
| | * | | | [ARM] 5301/1: ARM: OMAP: Add missing irq definesTony Lindgren2008-10-141-0/+18
| | * | | | Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/gi...Russell King2008-10-1135-90/+5477
| | |\ \ \ \
| | | * | | | ARM: OMAP3: Add default kernel config for OMAP LDPNishant Kamat2008-10-101-0/+1044
| | | * | | | ARM: OMAP3: Add basic board support for OMAP LDPNishant Kamat2008-10-105-0/+131
| | | * | | | ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)Steve Sakoman2008-10-101-0/+1885
| | | * | | | ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)Steve Sakoman2008-10-094-0/+272
| | | * | | | ARM: OMAP3: Add Beagle defconfigSyed Mohammed, Khasim2008-10-091-0/+1321
| | | * | | | ARM: OMAP3: Add minimal Beagle board supportSyed Mohammed, Khasim2008-10-096-1/+287
| | | * | | | ARM: OMAP3: Add minimal omap3430 supportSyed Mohammed, Khasim2008-10-0925-90/+538
| | * | | | | Merge branch 'omap2-upstream' of git://git.kernel.org/pub/scm/linux/kernel/gi...Russell King2008-10-0933-249/+798
| | |\| | | |
| | | * | | | ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ codePaul Walmsley2008-10-091-29/+40