summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-08-025-3/+26
|\
| * cfg80211: Clear "beacon_found" on regulatory restorePaul Stewart2012-08-021-0/+1
| * cfg80211: add channel flag to prohibit OFDM operationSeth Forshee2012-08-022-0/+4
| * mac80211: cancel mesh path timerJohannes Berg2012-08-011-0/+1
| * mac80211: clear timer bits when disconnectingJohannes Berg2012-08-012-0/+4
| * mac80211: don't clear sched_scan_sdata on sched scan stop requestEliad Peller2012-07-301-1/+0
| * Merge remote-tracking branch 'wireless/master' into mac80211Johannes Berg2012-07-304412-95763/+146493
| |\
| * | wireless: reg: restore previous behaviour of chan->max_power calculationsStanislaw Gruszka2012-07-251-1/+15
| * | mac80211: fix scan_sdata assignmentJohannes Berg2012-07-241-1/+1
* | | ipv4: route.c cleanupEric Dumazet2012-08-021-4/+0
* | | bnx2x: fix mem leak when command is unknownJesper Juhl2012-08-021-0/+1
* | | Fix unexpected SA hard expiration after changing dateFan Du2012-08-022-4/+21
* | | tcp: Apply device TSO segment limit earlierBen Hutchings2012-08-025-11/+20
* | | sfc: Fix maximum number of TSO segments and minimum TX queue sizeBen Hutchings2012-08-024-9/+46
* | | net: Allow driver to limit number of GSO segments per skbBen Hutchings2012-08-022-0/+6
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-08-0114-72/+108
|\ \ \
| * | | MIPS: Loongson 2: Sort out clock managment.Ralf Baechle2012-08-017-51/+33
| * | | MIPS: Loongson 1: more clk support and add select HAVE_CLKYoichi Yuasa2012-08-012-0/+17
| * | | MIPS: txx9: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * | | MIPS: BCM63xx: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * | | MIPS: AR7: Fix redefinition of clk_* by adding select HAVE_CLKYoichi Yuasa2012-08-011-0/+1
| * | | MIPS: Lantiq: Platform specific CLK fixupJohn Crispin2012-08-011-0/+5
| * | | MIPS: Lantiq: Add device_tree_init functionJohn Crispin2012-08-011-0/+22
| * | | MIPS: Lantiq: Fix interface clock and PCI control register offsetJohn Crispin2012-08-011-21/+28
* | | | Merge branch 'for-linus-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-08-0123-302/+206
|\ \ \ \
| * | | | um: Add arch/x86/um to MAINTAINERSRichard Weinberger2012-08-021-0/+1
| * | | | um: pass siginfo to guest processMartin Pärtel2012-08-0210-34/+71
| * | | | um: fix ubd_file_size for read-only filesMartin Pärtel2012-08-021-1/+1
| * | | | um: pull interrupt_end() into userspace()Al Viro2012-08-022-8/+6
| * | | | um: split syscall_trace(), pass pt_regs to itAl Viro2012-08-023-43/+34
| * | | | um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regsAl Viro2012-08-013-5/+5
| * | | | um: set BLK_CGROUP=y in defconfigRichard Weinberger2012-07-281-1/+1
| * | | | um: remove count_lockRichard Weinberger2012-07-282-7/+0
| * | | | um: fully use tty_portRichard Weinberger2012-07-284-78/+65
| * | | | um: Remove dead codeRichard Weinberger2012-07-281-26/+0
| * | | | um: remove line_ioctl()Richard Weinberger2012-07-284-90/+0
| * | | | TTY: um/line, use tty from tty_portJiri Slaby2012-07-283-9/+21
| * | | | TTY: um/line, add tty_portJiri Slaby2012-07-282-4/+5
* | | | | Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-08-0128-1415/+2124
|\ \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Merge branches 'dma-omap', 'dma-pl08x' and 'dma-sa11x0' into dmaengineRussell King2012-07-3111-785/+614
| |\ \ \ \ \ \
| | | * | | | | dmaengine: sa11x0-dma: add cyclic DMA supportRussell King2012-07-011-16/+92
| | | * | | | | dmaengine: sa11x0-dma: fix DMA residue supportRussell King2012-07-011-16/+29
| | * | | | | | dmaengine: PL08x: ensure all descriptors are freed when channel is releasedRussell King2012-07-011-0/+2
| | * | | | | | dmaengine: PL08x: get rid of write only pool_ctr and free_txd lockingRussell King2012-07-011-12/+0
| | * | | | | | dmaengine: PL08x: get rid of pl08x_prep_channel_resourcesRussell King2012-07-011-23/+9
| | * | | | | | dmaengine: PL08x: fix tx_status function to return correct residueRussell King2012-07-011-27/+34
| | * | | | | | dmaengine: PL08x: convert to use vchan done listRussell King2012-07-011-81/+54
| | * | | | | | dmaengine: PL08x: convert to use vchan submitted/issued listsRussell King2012-07-011-47/+17
| | * | | | | | dmaengine: PL08x: use vchan's spinlockRussell King2012-07-012-25/+21
| | * | | | | | dmaengine: PL08x: convert to use virt-dma structsRussell King2012-07-011-28/+29
OpenPOWER on IntegriCloud