summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-04-2426-124/+237
|\
| * tun: Multicast handling in tun_chr_ioctl() needs proper locking.David S. Miller2008-04-241-0/+10
| * [NET]: Fix heavy stack usage in seq_file output routines.Pavel Emelyanov2008-04-246-50/+56
| * [AF_UNIX] Initialise UNIX sockets before general device initcallsDavid Woodhouse2008-04-241-1/+5
| * [RTNETLINK]: Fix bogus ASSERT_RTNL warningPatrick McHardy2008-04-232-2/+8
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-04-2314-38/+129
| |\
| | * iwlwifi: Don't unlock priv->mutex if it isn't lockedRoland Dreier2008-04-232-2/+0
| | * wireless: rndis_wlan: modparam_workaround_interval is never below 0.Roel Kluin2008-04-231-2/+3
| | * prism54: prism54_get_encode() test below 0 on unsigned indexRoel Kluin2008-04-231-1/+1
| | * mac80211: update mesh EID valuesLuis Carlos Cobo2008-04-231-7/+13
| | * b43: Workaround DMA quirksMichael Buesch2008-04-231-8/+39
| | * mac80211: fix use before check of Qdisc lengthRon Rindjunsky2008-04-231-1/+1
| | * net/mac80211/rx.c: fix off-by-oneAdrian Bunk2008-04-231-1/+1
| | * mac80211: Fix race between ieee80211_rx_bss_put and lookup routines.Pavel Emelyanov2008-04-231-2/+5
| | * ath5k: Fix radio identification on AR5424/2424Nick Kossifidis2008-04-231-4/+10
| | * ssb: Fix all-ones boardflagsLarry Finger2008-04-231-0/+5
| | * b43: Add more btcoexist workaroundsMichael Buesch2008-04-231-4/+9
| | * b43: Fix HostFlags data typesMichael Buesch2008-04-232-3/+4
| | * b43: Workaround invalid bluetooth settingsMichael Buesch2008-04-231-2/+20
| | * mac80211: MAINTAINERS updateJohannes Berg2008-04-231-4/+2
| | * mac80211: Fix n-band association problemAbhijeet Kolekar2008-04-231-1/+20
| * | iwlwifi: Fix built-in compilation of iwlcore (part 2)Zhu Yi2008-04-231-2/+1
| * | tun: Fix minor race in TUNSETLINK ioctl handling.David S. Miller2008-04-231-2/+9
| * | ppp_generic: use stats from net_device structurePaulius Zaleckas2008-04-231-29/+19
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-04-2449-484/+1160
|\ \
| * | sparc: sunzilog uart orderRobert Reif2008-04-241-13/+17
| * | [SPARC64]: Detect trap frames in stack backtraces.David S. Miller2008-04-242-7/+28
| * | [SPARC64]: %l6 trap return handling no longer necessary.David S. Miller2008-04-249-63/+45
| * | [SPARC64]: Use trap type stored in pt_regs to handle syscall restart.David S. Miller2008-04-242-21/+21
| * | [SPARC64]: Store magic cookie and trap type in pt_regs.David S. Miller2008-04-232-2/+20
| * | [SPARC64]: PROM debug console can be CON_ANYTIME.David S. Miller2008-04-231-1/+1
| * | sparc64: cleanup after SunOS/Solaris binary emulation removalAdrian Bunk2008-04-232-3/+1
| * | sparc: cleanup after SunOS binary emulation removalAdrian Bunk2008-04-232-6/+0
| * | [SPARC64]: Add NUMA support.David S. Miller2008-04-237-138/+881
| * | [SPARC64]: Allocate TSB node-local.David S. Miller2008-04-231-1/+2
| * | [SPARC64]: NUMA device infrastructure.David S. Miller2008-04-2316-23/+91
| * | [SPARC64]: Kill pci_iommu_table_init() declaration.David S. Miller2008-04-231-2/+0
| * | [SPARC64]: Once we have the boot cmdline, call parse_early_param()David S. Miller2008-04-231-0/+1
| * | [SPARC64]: Remove unused asm-sparc64/numnodes.hDavid S. Miller2008-04-231-6/+0
| * | [SPARC64]: Decrease SECTION_SIZE_BITS to 30.David S. Miller2008-04-231-1/+1
| * | [SPARC64]: Initialize MDESC earlier and use lmb_alloc()David S. Miller2008-04-232-15/+19
| * | [SPARC64]: Use lmb_alloc() for PROM device tree.David S. Miller2008-04-232-7/+11
| * | [SPARC64]: Call real_setup_per_cpu_areas() earlier and use lmb_alloc().David S. Miller2008-04-232-5/+14
| * | [SPARC64]: Fully use LMB information in bootmem_init().David S. Miller2008-04-231-82/+18
| * | [SPARC64]: Start using LMB information in bootmem_init().David S. Miller2008-04-231-126/+6
| * | [SPARC64]: Initialize LMB tables.David S. Miller2008-04-231-1/+13
| * | [SPARC64]: Move ramdisk discovery code out to seperate function.David S. Miller2008-04-231-24/+33
| * | [LMB]: Fix lmb allocation regression.David S. Miller2008-04-231-1/+1
* | | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-04-2426-24/+32
|\ \ \
| * | | [ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84fCatalin Marinas2008-04-2423-17/+29
OpenPOWER on IntegriCloud