summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-next/mtd'Sascha Hauer2016-05-093-58/+42
|\
| * mtd: nand: omap_gpmc: Fix bitflips in empty pageTeresa Remmet2016-04-121-20/+42
| * mtd: nand: omap_gpmc: Remove BCH4 supportTeresa Remmet2016-04-123-39/+1
* | Merge branch 'for-next/misc'Sascha Hauer2016-05-0951-531/+724
|\ \
| * | net: phy: Add fixed link supportSascha Hauer2016-05-092-9/+42
| * | Kconfig: Create Kconfig symbol for NVVARSascha Hauer2016-04-283-3/+32
| * | Kconfig: Make ENV_HANDLING visibleSascha Hauer2016-04-282-7/+13
| * | Kconfig: Make GLOBALVAR visibleSascha Hauer2016-04-282-6/+11
| * | ATA: Implement a hook for 'devinfo'Andrey Smirnov2016-04-281-0/+9
| * | scripts: Add big endian conversion macros to endian.hSascha Hauer2016-04-281-0/+44
| * | of: fix of_tree_for_each_node_from() macroBoris Brezillon2016-04-281-32/+6
| * | state: Fix Kconfig dependenciesSascha Hauer2016-04-282-1/+1
| * | drivers/of: Always compile of_path.c with OF supportSascha Hauer2016-04-281-2/+2
| * | of: preserve /memreserve/ entriesSascha Hauer2016-04-251-6/+100
| * | whole tree: remove trailing whitespacesDu Huanpeng2016-04-2132-438/+438
| * | menu: add vi like key supportDu Huanpeng2016-04-191-6/+9
| * | wchar_t: wchar_t should go to stddef.hDu Huanpeng2016-04-143-4/+4
| * | NULL: keep NULL definition in stddef.h onlyDu Huanpeng2016-04-142-14/+2
| * | mci: mxs: add support for dt aliases to name devicesUwe Kleine-König2016-04-121-1/+9
| * | pinctrl: mxs: add raw value from device tree to debug outputUwe Kleine-König2016-04-121-2/+2
| |/
* | Merge branch 'for-next/include-pdata'Sascha Hauer2016-05-0989-81/+54
|\ \
| * | include: Move ide platform_data to include/platform_dataSascha Hauer2016-04-155-4/+4
| * | include: Move smc911x eth platform_data to include/platform_dataSascha Hauer2016-04-154-3/+3
| * | include: Move dm9000 eth platform_data to include/platform_dataSascha Hauer2016-04-159-8/+7
| * | include: Move ns16550 serial platform_data to include/platform_dataSascha Hauer2016-04-1521-20/+11
| * | include: Move fec eth platform_data to include/platform_dataSascha Hauer2016-04-1537-36/+20
| * | include: Move davinci emac platform_data to include/platform_dataSascha Hauer2016-04-152-1/+1
| * | include: Move designware eth platform_data to include/platform_dataSascha Hauer2016-04-153-2/+1
| * | include: Move smc91111 eth platform_data to include/platform_dataSascha Hauer2016-04-156-5/+5
| * | include: Move ep93xx eth platform_data to include/platform_dataSascha Hauer2016-04-153-2/+2
* | | Merge branch 'for-next/include-cleanup'Sascha Hauer2016-05-09130-584/+509
|\ \ \
| * | | commands: mmc_extcsd: Fix incorrect usage of sprintfAndrey Smirnov2016-04-281-33/+46
| * | | stdio: Whitespace cleanupSascha Hauer2016-04-151-13/+13
| * | | stdio: Replace FILE functions with filedescriptor functionsSascha Hauer2016-04-155-37/+24
| * | | stdio: replace fprintf(stderr,...) with eprintfSascha Hauer2016-04-157-11/+12
| * | | stdio: rename getc to getcharSascha Hauer2016-04-1512-32/+32
| * | | fs: move libc function prototypes to their correct locationsSascha Hauer2016-04-157-140/+78
| * | | move unlink_recursive declaration to libfile.hSascha Hauer2016-04-155-2/+5
| * | | move make_directory declaration to libfile.hSascha Hauer2016-04-157-3/+8
| * | | string: Fix (v)asprintf prototypesSascha Hauer2016-04-1577-165/+211
| * | | show_progress: print spaces with %*sSascha Hauer2016-04-151-2/+1
| * | | libfile: move open_and_lseek() to libfileSascha Hauer2016-04-1510-24/+40
| * | | include: move crc specific stuff to crc.hSascha Hauer2016-04-1515-101/+22
| * | | include: move shell prototypes to shell.hSascha Hauer2016-04-154-11/+13
| * | | include/common.h: remove unused struct memarea_infoSascha Hauer2016-04-151-10/+0
| * | | include: move run_command prototype to command.hSascha Hauer2016-04-156-1/+5
| |/ /
* | | Merge branch 'for-next/imx6-phytec'Sascha Hauer2016-05-0919-34/+246
|\ \ \
| * | | ARM: phytec-som-imx6: add automount for first partition on eMMCStefan Christ2016-05-041-0/+3
| * | | ARM: phytec-som-imx6: add NOR for phycore-imx6 emmcStefan Christ2016-05-023-0/+17
| * | | ARM: phytec-som-imx6: adapt main update handler for eMMCStefan Christ2016-05-021-1/+8