summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Documentation: dt: update properties in TI GPMC NAND exampleJon Hunter2013-04-301-14/+14
* Documentation: dt: update TI GPMC ethernet binding propertiesJavier Martinez Canillas2013-04-301-28/+28
* Merge branch 'omap-gpmc-for-v3.10-take2' of git://github.com/jonhunter/linux ...Tony Lindgren2013-04-0410-309/+831
|\
| * ARM: OMAP2+: Add GPMC DT support for Ethernet child nodesJavier Martinez Canillas2013-04-042-0/+105
| * ARM: OMAP2+: rename gpmc_probe_nor_child() to gpmc_probe_generic_child()Javier Martinez Canillas2013-04-041-5/+5
| * ARM: OMAP2+: return -ENODEV if GPMC child device creation failsJavier Martinez Canillas2013-04-041-0/+1
| * ARM: OMAP2+: Allow GPMC probe to complete even if CS mapping failsJon Hunter2013-04-041-17/+7
| * ARM: OMAP2+: Remove unnecesssary GPMC definitions and variableJon Hunter2013-04-041-7/+5
| * ARM: OMAP2+: Detect incorrectly aligned GPMC base addressJon Hunter2013-04-041-3/+19
| * ARM: OMAP2+: Convert ONENAND to retrieve GPMC settings from DTJon Hunter2013-04-042-6/+18
| * ARM: OMAP2+: Convert NAND to retrieve GPMC settings from DTJon Hunter2013-04-041-6/+10
| * ARM: OMAP2+: Add device-tree support for NOR flashJon Hunter2013-04-042-0/+213
| * ARM: OMAP2+: Add additional GPMC timing parametersJon Hunter2013-04-042-74/+98
| * ARM: OMAP2+: Add function to read GPMC settings from device-treeJon Hunter2013-04-013-0/+65
| * ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure()Jon Hunter2013-04-013-47/+9
| * ARM: OMAP2+: Convert TUSB to use gpmc_cs_program_settings()Jon Hunter2013-04-011-24/+19
| * ARM: OMAP2+: Convert SMC91x to use gpmc_cs_program_settings()Jon Hunter2013-04-011-13/+17
| * ARM: OMAP2+: Convert NAND to use gpmc_cs_program_settings()Jon Hunter2013-04-011-12/+23
| * ARM: OMAP2+: Convert ONENAND to use gpmc_cs_program_settings()Jon Hunter2013-04-011-36/+25
| * ARM: OMAP2+: Add function for configuring GPMC settingsJon Hunter2013-04-012-0/+106
| * ARM: OMAP2+: Add structure for storing GPMC settingsJon Hunter2013-04-015-40/+72
| * ARM: OMAP2+: Add variable to store number of GPMC waitpinsJon Hunter2013-04-011-0/+13
| * ARM: OMAP2+: Simplify code configuring ONENAND devicesJon Hunter2013-04-011-16/+10
| * ARM: omap2: gpmc: Remove redundant chip select out of range checkEzequiel Garcia2013-04-011-9/+1
| * ARM: omap2: gpmc-onenand: Replace printk KERN_ERR with dev_warn()Ezequiel Garcia2013-04-011-1/+1
| * ARM: omap2: gpmc-onenand: Replace pr_err() with dev_err()Ezequiel Garcia2013-04-011-3/+4
| * ARM: omap2: gpmc-onenand: Print something useful on CS request failureEzequiel Garcia2013-04-011-1/+2
| * ARM: omap2: gpmc-nand: Print something useful on CS request failureEzequiel Garcia2013-04-011-1/+2
| * ARM: omap2: gpmc: Fix gpmc_cs_reserved() return valueEzequiel Garcia2013-04-011-2/+2
| * ARM: omap2: gpmc: Remove unused gpmc_round_ns_to_ticks() functionEzequiel Garcia2013-04-011-7/+0
| * ARM: omap2: gpmc: Mark local scoped functions staticEzequiel Garcia2013-04-012-14/+7
| * ARM: OMAP: Clear GPMC bits when applying new setting.Mark Jackson2013-04-012-1/+8
|/
* Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmpJon Hunter2013-04-0110415-275128/+535997
|\
| * ARM: OMAP2+: Fix broken gpmc supportJon Hunter2013-03-041-3/+3
| * ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.hTony Lindgren2013-03-043-0/+6
| * Linux 3.9-rc1v3.9-rc1Linus Torvalds2013-03-041-2/+2
| * Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhow...Linus Torvalds2013-03-038-254/+284
| |\
| | * UAPI: (Scripted) Disintegrate include/videoDavid Howells2012-12-208-254/+284
| * | Merge tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2013-03-035-49/+57
| |\ \
| | * | xenbus: fix compile failure on ARM with Xen enabledSteven Noonan2013-03-011-0/+1
| | * | xen/pci: We don't do multiple MSI's.Konrad Rzeszutek Wilk2013-03-011-0/+9
| | * | xen/pat: Disable PAT using pat_enabled value.Konrad Rzeszutek Wilk2013-02-281-1/+9
| | * | xen/acpi: xen cpu hotplug minor updatesLiu Jinsong2013-02-251-22/+12
| | * | xen/acpi: xen memory hotplug minor updatesLiu Jinsong2013-02-251-26/+26
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-03-0326-171/+108
| |\ \ \
| | * | | constify path_get/path_put and fs_struct.c stuffAl Viro2013-03-025-10/+10
| | * | | fix nommu breakage in shmem.cAl Viro2013-03-021-3/+2
| | * | | cache the value of file_inode() in struct fileAl Viro2013-03-023-2/+6
| | * | | 9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentryAl Viro2013-02-281-3/+17
| | * | | 9p: make sure ->lookup() adds fid to the right dentryAl Viro2013-02-281-2/+5