summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-nextLinus Torvalds2012-01-098-347/+8
|\
| * sparc32: remove unused file: include/asm/pgtsun4.hSam Ravnborg2011-12-301-171/+0
| * sparc32: fix PAGE_SIZE definitionSam Ravnborg2011-12-292-8/+4
| * sparc32: enable different preemptions modelsSam Ravnborg2011-12-291-2/+0
| * sparc32: support atomic64_tSam Ravnborg2011-12-272-0/+3
| * apbuart: fix section mismatch warningSam Ravnborg2011-12-271-2/+2
| * sparc32: drop useless preprocessor conditional in atomic_32.hSam Ravnborg2011-12-271-4/+0
| * sparc32: drop unused atomic24 supportSam Ravnborg2011-12-273-161/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-0919-32/+57
|\ \
| * | igmp: Avoid zero delay when receiving odd mixture of IGMP queriesBen Hutchings2012-01-091-0/+2
| * | netdev: make net_device_ops conststephen hemminger2012-01-092-3/+2
| * | bcm63xx: make ethtool_ops conststephen hemminger2012-01-091-1/+1
| * | usbnet: make ethtool_ops conststephen hemminger2012-01-094-5/+5
| * | net: Fix build with INET disabled.David S. Miller2012-01-092-2/+1
| * | net: introduce netif_addr_lock_nested() and call if when appropriateJiri Pirko2012-01-092-6/+11
| * | net: correct lock name in dev_[uc/mc]_sync documentations.Jiri Pirko2012-01-091-2/+2
| * | net: sk_update_clone is only used in net/core/sock.cStephen Rothwell2012-01-092-6/+6
| * | 8139cp: fix missing napi_gro_flush.françois romieu2012-01-091-0/+1
| * | pktgen: set correct max and min in pktgen_setup_inject()Dan Carpenter2012-01-071-2/+2
| * | smsc911x: Unconditionally include linux/smscphy.h in smsc911x.hDavid S. Miller2012-01-071-2/+0
| * | asix: fix infinite loop in rx_fixup()Aurelien Jacobs2012-01-071-1/+1
| * | net: Default UDP and UNIX diag to 'n'.David S. Miller2012-01-072-2/+6
| * | r6040: fix typo in use of MCR0 register bitsCesar Eduardo Barros2012-01-071-1/+1
| * | net: fix sock_clone reference mismatch with tcp memcontrolGlauber Costa2012-01-073-5/+22
* | | Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-0917-58/+97
|\ \ \
| * \ \ Merge branch 'imx/clk' into next/clkArnd Bergmann2012-01-0317-58/+97
| |\ \ \
| | * | | Merge branch 'mxs/clk-prepare' of git://git.linaro.org/people/shawnguo/linux-...Arnd Bergmann2012-01-0317-58/+97
| |/| | |
| | * | | ARM: mxs: select HAVE_CLK_PREPARE for clockShawn Guo2011-12-282-9/+23
| | * | | clk: add config option HAVE_CLK_PREPARE into KconfigShawn Guo2011-12-281-0/+3
| | * | | ASoC: mxs-saif: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-2/+2
| | * | | video: mxsfb: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * | | serial: mxs-auart: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * | | net: flexcan: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-5/+5
| | * | | mtd: gpmi-lib: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-6/+6
| | * | | mmc: mxs-mmc: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-5/+5
| | * | | dma: mxs-dma: convert to clk_prepare/clk_unprepareShawn Guo2011-12-281-4/+4
| | * | | net: fec: add clk_prepare/clk_unprepareRichard Zhao2011-12-281-5/+5
| | * | | ARM: mxs: convert platform code to clk_prepare/clk_unprepareShawn Guo2011-12-286-14/+14
| | * | | clk: add helper functions clk_prepare_enable and clk_disable_unprepareRichard Zhao2011-12-281-0/+22
* | | | | Merge tag 'timer' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-223/+124
|\ \ \ \ \
| * | | | | msm: timer: Use clockevents_config_and_register()Stephen Boyd2011-11-101-10/+1
| * | | | | msm: timer: Setup interrupt after registering clockeventStephen Boyd2011-11-101-4/+2
| * | | | | msm: timer: Remove SoC specific #ifdefsStephen Boyd2011-11-101-21/+17
| * | | | | msm: timer: Remove msm_clocks[] and simplify codeStephen Boyd2011-11-101-145/+76
| * | | | | msm: timer: Fix ONESHOT mode interruptsStephen Boyd2011-11-101-5/+20
| * | | | | msm: timer: Use GPT for clockevents and DGT for clocksourceStephen Boyd2011-11-101-69/+52
| * | | | | msm: timer: Cleanup #includes and #definesStephen Boyd2011-11-101-19/+7
| * | | | | msm: timer: Tighten #ifdef for local timer supportStephen Boyd2011-11-101-3/+2
* | | | | | Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-0959-1180/+3871
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'imx6/pm' into next/pmOlof Johansson2012-01-061-1/+1
| |\ \ \ \ \ \