summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let...Linus Torvalds2011-01-1364-158/+1009
|\
| * Merge branch 'sh/alphaproject' into sh-latestPaul Mundt2011-01-137-0/+558
| |\
| | * sh: Add support for AP-SH4AD-0A board.Paul Mundt2011-01-135-0/+268
| | * sh: Add support for AP-SH4A-3A board.Paul Mundt2011-01-135-0/+286
| | * sh: Add a new mach type for alpha project boards.Paul Mundt2011-01-132-0/+4
| * | Merge branch 'common/serial-rework' into sh-latestPaul Mundt2011-01-1329-11/+276
| |\ \
| | * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...Paul Mundt2011-01-139266-713287/+725703
| | |\|
| | * | serial: sh-sci: Move SCBRR calculation algo in to platform data.Paul Mundt2009-06-2424-0/+88
| | * | serial: sh-sci: Move SCSCR_INIT in to platform data.Paul Mundt2009-06-2424-26/+123
| * | | sh: sh7372 SH4AL-DSP probe supportMagnus Damm2011-01-133-2/+7
| * | | Merge branch 'sh/sdio' into sh-latestPaul Mundt2011-01-12287-11776/+12077
| |\ \ \
| | * | | sh: sh7366 Enable SDIO IRQsMagnus Damm2011-01-121-10/+14
| | * | | sh: sh7343 Enable SDIO IRQsMagnus Damm2011-01-121-11/+14
| | * | | sh: mach-ecovec24: enable runtime PM for SDHIArnd Hannemann2011-01-121-2/+2
| | * | | sh: sh7723 / ap325rxa enable SDIO IRQsArnd Hannemann2011-01-122-2/+18
| | * | | sh: sh7722 Enable SDIO IRQsArnd Hannemann2011-01-122-1/+3
| | * | | sh: sh7724 Enable SDIO IRQsArnd Hannemann2011-01-124-2/+9
| | | |/ | | |/|
| * | | sh: Fix up legacy PTEA space attribute mapping.Paul Mundt2011-01-112-2/+15
| * | | sh: Stub out legacy PCC pgprot encoding for X2 TLBs.Paul Mundt2011-01-111-7/+1
| * | | sh: constify prefetch pointers.Paul Mundt2011-01-111-2/+4
| | | |
| | \ \
| *-. \ \ Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latestPaul Mundt2011-01-11498-12684/+31701
| |\ \ \ \
| | | * | | mmc, sh: Remove sh_mmcif_boot_slurp()Simon Horman2010-12-081-1/+3
| | | * | | mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.hSimon Horman2010-12-081-3/+0
| | * | | | sh: Add a machvec callback for early memblock reservations.Paul Mundt2011-01-112-2/+9
| * | | | | sh: update sh7757lcr_defconfigYoshihiro Shimoda2011-01-111-10/+1
| * | | | | sh: add PVR probing for SH7757 3rd cutYoshihiro Shimoda2011-01-111-0/+1
| * | | | | sh: Use device_initcall() instead of __initcall()Nobuhiro Iwamatsu2011-01-1110-10/+10
| * | | | | sh: intc - convert board specific landisk codeNobuhiro Iwamatsu2011-01-111-24/+35
| * | | | | sh: Move init_landisk_IRQ to header fileNobuhiro Iwamatsu2011-01-112-3/+3
| * | | | | sh: Fix IRQ macro in header of landiskNobuhiro Iwamatsu2011-01-111-1/+1
| * | | | | sh: pci: Add pci_fixup_pcic to pci of landiskNobuhiro Iwamatsu2011-01-111-2/+26
| * | | | | sh: Kill off deprecated ctrl_in/out I/O routines.Paul Mundt2011-01-111-51/+0
| * | | | | sh: mach-sdk7786: Fix up fallout from clkdev consolidation.Paul Mundt2011-01-071-1/+1
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6Linus Torvalds2011-01-1316-40/+374
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linuxPaul Mundt2011-01-1116-40/+374
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new o...Sumit Semwal2011-01-101-0/+2
| | * | | | | OMAP: DSS2: LCD2 Channel Changes for DISPCSumit Semwal2011-01-101-0/+4
| | * | | | | OMAP: DSS2: Represent DISPC register defines with channel as parameterSumit Semwal2011-01-101-0/+2
| | * | | | | OMAP: use generic DPI panel driver in board filesBryan Wu2011-01-108-38/+105
| | * | | | | OMAP: DSS2: Add generic DPI panel display driverBryan Wu2011-01-101-0/+37
| | * | | | | OMAP3: Enable display on ZOOM2/3/3630SDPKishore Y2011-01-102-0/+2
| | * | | | | OMAP3: ZOOM2/3/3630SDP: Add display board file for OMAP3Kishore Y2011-01-104-2/+221
| | * | | | | OMAP3630: DSS2: Enable Pre-Multiplied Alpha SupportRajkumar N2011-01-101-0/+1
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2011-01-1328-140/+850
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'topic/asoc' into for-linusTakashi Iwai2011-01-1328-140/+850
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'topic/workq-update' into topic/asocTakashi Iwai2010-12-13188-2232/+6112
| | |\ \ \ \ \ \ \
| | * | | | | | | | ASoC: sh: fsi-ak4642: Add FSI port and ak464x selectionKuninori Morimoto2010-11-302-0/+10
| | * | | | | | | | ARM: Samsung: Make sure ASoC DMA device is prototypedMark Brown2010-11-251-0/+1
| | * | | | | | | | ASoC: SMDK_WM8580: Enable for SMDKC100Jassi Brar2010-11-231-0/+2
| | * | | | | | | | ASoC: Samsung: Rename AC97 platform deviceJassi Brar2010-11-234-4/+4