aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'apei' into apei-releaseLen Brown2011-08-0313-0/+15
|\
| * Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHGHuang Ying2011-08-0313-0/+15
* | Merge branch 'gpiolib' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/...Linus Torvalds2011-08-012-0/+59
|\ \
| * | [IA64] Hook up gpiolib supportMark Brown2011-06-012-0/+59
* | | Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-08-0112-1135/+63
|\ \ \
| * \ \ Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux...Grant Likely2011-08-0112-1135/+63
| |\ \ \
| | * | | gpio_msm: Move Qualcomm MSM v2 gpio driver into driversDavid Brown2011-08-013-439/+1
| | * | | gpio_msm: Move Qualcomm v6 MSM driver into driversDavid Brown2011-08-013-639/+3
| | * | | msm: gpio: Fold register defs into C fileDavid Brown2011-08-012-273/+250
| | * | | msm: gpiomux: Move public API to public headerDavid Brown2011-08-013-17/+40
| | * | | msm: gpio: Remove ifdefs on gpio chip registersDavid Brown2011-08-011-7/+26
| | * | | msm: gpio: Remove chip-specific register definitionsDavid Brown2011-08-012-226/+220
| | * | | msm: Remove chip-ifdefs for GPIO io mappingsDavid Brown2011-08-015-24/+20
| | * | | msm: gpio: Remove unsupported devicesDavid Brown2011-08-011-7/+0
* | | | | Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2011-08-011-23/+3
|\ \ \ \ \
| * | | | | OMAP: DSS2: Remove unused code from display.cTomi Valkeinen2011-07-251-10/+0
| * | | | | OMAP: DSS2: Remove unused opt_clock_availableTomi Valkeinen2011-07-251-12/+0
| * | | | | OMAP: DSS2: Use omap_pm_get_dev_context_loss_count to get ctx loss countTomi Valkeinen2011-07-251-1/+3
| * | | | | OMAP: DSS2: rewrite use of context_loss_countTomi Valkeinen2011-07-251-1/+1
* | | | | | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let...Linus Torvalds2011-08-0145-433/+316
|\ \ \ \ \ \
| * | | | | | SH: static should be at beginning of declarationJesper Juhl2011-07-115-7/+7
| * | | | | | sh: move CLKDEV_xxx_ID macro to sh_clk.hKuninori Morimoto2011-07-1118-55/+0
| * | | | | | sh: clock-shx3: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-52/+14
| * | | | | | sh: clock-sh7786: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-92/+22
| * | | | | | sh: clock-sh7785: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-62/+16
| * | | | | | sh: clock-sh7757: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-27/+8
| * | | | | | sh: clock-sh7366: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-16/+6
| * | | | | | sh: clock-sh7343: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-21/+7
| * | | | | | sh: clock-sh7722: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-32/+11
| * | | | | | sh: clock-sh7724: add CLKDEV_ICK_ID for cleanupKuninori Morimoto2011-07-111-62/+17
| * | | | | | sh: clock-sh7366: modify I2C clock settingsKuninori Morimoto2011-07-111-1/+2
| * | | | | | sh: clock-sh7343: modify I2C clock settingsKuninori Morimoto2011-07-111-2/+3
| * | | | | | sh: clock-sh7723: modify I2C clock settingsKuninori Morimoto2011-07-111-1/+2
| * | | | | | sh: clock-sh7722: modify I2C clock settingsKuninori Morimoto2011-07-111-1/+2
| * | | | | | sh: clock-sh7724: modify I2C clock settingsKuninori Morimoto2011-07-111-2/+3
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'common/serial-rework' and 'sh/stable-updates' into sh-latestPaul Mundt2011-06-291-28/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sh/stable-updates' into sh-latestPaul Mundt2011-06-241-0/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | sh: Tidy up pre-clkdev clk_get() error handling.Paul Mundt2011-06-245-5/+5
| * | | | | | | | | Merge branch 'sh/clkfwk' into sh-latestPaul Mundt2011-06-241-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sh/stable-updates' into sh-latestPaul Mundt2011-06-2124-107/+325
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sh: Fix up build fallout from serial merge.Paul Mundt2011-06-203-1/+3
| | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ Merge branches 'common/dma' and 'sh/stable-updates' into sh-latestPaul Mundt2011-06-1662-121/+300
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'common/serial-rework' into sh-latestPaul Mundt2011-06-1522-15/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | serial: sh-sci: Abstract register maps.Paul Mundt2011-06-1422-15/+207
| | * | | | | | | | | | | | serial: sh-sci: Consolidate RXD pin handling.Paul Mundt2011-06-082-0/+2
* | | | | | | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gee...Linus Torvalds2011-07-3110-931/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | m68k/math-emu: Remove unnecessary codeGreg Dietsche2011-07-301-3/+0
| * | | | | | | | | | | | | | m68k/math-emu: Remove commented out old codeGeert Uytterhoeven2011-07-301-530/+0
| * | | | | | | | | | | | | | m68k: Kill warning in setup_arch() when compiling for Sun3Geert Uytterhoeven2011-07-301-0/+2
| * | | | | | | | | | | | | | m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_Geert Uytterhoeven2011-07-301-2/+2