summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kconfig'Sascha Hauer2012-12-0848-149/+136
|\
| * Fix wrong Kconfig reference to ARCH_IMX31Alexander Shiyan2012-12-081-2/+2
| * Remove bad Kconfig reference to MTD_NANDAlexander Shiyan2012-12-081-1/+0
| * Remove bad Kconfig reference to HAS_PCIAlexander Shiyan2012-12-081-1/+0
| * Remove bad Kconfig reference to DISK_DRIVEAlexander Shiyan2012-12-081-1/+0
| * Remove bad Kconfig reference to HAVE_CLKAlexander Shiyan2012-12-081-1/+0
| * Remove bad Kconfig reference to HAVE_MMUAlexander Shiyan2012-12-081-1/+0
| * Remove bad Kconfig reference to HAS_CFIAlexander Shiyan2012-12-083-3/+0
| * Cleanup Kconfig filesAlexander Shiyan2012-12-0846-142/+138
* | let kbuild build foo/bar.o correctly张忠山2012-12-081-4/+4
* | Merge branch 'for-next/tftp'Sascha Hauer2012-12-071-24/+0
|\ \
| * | uimage: fix misunderstanding in common/uimage.cVicente Bergas2012-11-261-24/+0
* | | Merge branch 'for-next/phylib'Sascha Hauer2012-12-0729-84/+422
|\ \ \
| * | | net: phy: micrel: fix typo in driver nameJan Luebbe2012-12-051-1/+1
| * | | phylib: add micrel supportJean-Christophe PLAGNIOL-VILLARD2012-11-204-0/+210
| * | | phylib: add fixup supportJean-Christophe PLAGNIOL-VILLARD2012-11-203-8/+125
| * | | mdio_bus: fix matchJean-Christophe PLAGNIOL-VILLARD2012-11-201-1/+1
| * | | phylib: fix generic phy driver probeJean-Christophe PLAGNIOL-VILLARD2012-11-204-45/+34
| * | | driver: introduce device_probe to manully probe a deviceJean-Christophe PLAGNIOL-VILLARD2012-11-202-6/+22
| * | | macb/ether: split flags for drivers and phylibJean-Christophe PLAGNIOL-VILLARD2012-11-1919-25/+23
| * | | phylib: introduction of forced 100MbpsJean-Christophe PLAGNIOL-VILLARD2012-11-192-1/+6
| * | | phylib: export phy_id via paramJean-Christophe PLAGNIOL-VILLARD2012-11-191-0/+3
* | | | Merge branch 'for-next/omap'Sascha Hauer2012-12-074-13/+28
|\ \ \ \
| * | | | Define and use OMAP4 GPIO macros rather than magic constants.Robert P. J. Day2012-12-052-6/+21
| * | | | OMAP3: Replace magic GPIO numbers in omap3_generic.c with macros.Robert P. J. Day2012-12-051-6/+6
| * | | | OMAP4: removed __packed__ annotation from pad_conf_entryEnrico Scholz2012-12-051-1/+1
* | | | | Merge branch 'for-next/mtd'Sascha Hauer2012-12-073-60/+6
|\ \ \ \ \
| * | | | | mtd core: call driver write function with complete bufferSascha Hauer2012-12-071-53/+3
| * | | | | mtd nand: allow partial page writesSascha Hauer2012-12-071-7/+0
| * | | | | mtd oob: do not register oob device for devices without oobSascha Hauer2012-11-291-0/+3
* | | | | | Merge branch 'for-next/misc'Sascha Hauer2012-12-0734-250/+320
|\ \ \ \ \ \
| * | | | | | mach-omap/Kconfig: Some spelling fixes and indentation.Robert P. J. Day2012-12-051-5/+5
| * | | | | | Remove old, inaccurate "FileName:" cruft from ARM filesRobert P. J. Day2012-12-0527-124/+25
| * | | | | | password: fixed underflow on <backspace>Enrico Scholz2012-12-051-5/+8
| * | | | | | at25: use dev_lseek_default as at24 doesAntony Pavlov2012-12-031-6/+1
| * | | | | | Makefile: move ctags and cscope support to a shell scriptAntony Pavlov2012-12-032-108/+268
| * | | | | | ARM/MXS/i.MX28: distinguish POR and wake-up event correctlyJuergen Beisert2012-12-031-0/+11
| * | | | | | bus_for_each_device/bus_for_each_driver: add () to allow use &busJean-Christophe PLAGNIOL-VILLARD2012-11-191-2/+2
* | | | | | | Merge branch 'for-next/mfd'Sascha Hauer2012-12-071-1/+2
|\ \ \ \ \ \ \
| * | | | | | | mfd stmpe: fix test for featuresSascha Hauer2012-11-291-1/+1
| * | | | | | | mfd stmpe: add index to devicenameSascha Hauer2012-11-291-1/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'for-next/mem-commands'Sascha Hauer2012-12-075-15/+39
|\ \ \ \ \ \ \
| * | | | | | | commands: mw: add the '-x' option (swap bytes)Antony Pavlov2012-11-261-2/+7
| * | | | | | | commands: md: add the '-x' option (swap bytes)Antony Pavlov2012-11-261-7/+17
| * | | | | | | mem: add the swab (swap bytes) option to memory_display()Antony Pavlov2012-11-265-9/+18
* | | | | | | | Merge branch 'for-next/mci'Sascha Hauer2012-12-072-13/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | mci i.MX esdhc: turn error message into debug messageSascha Hauer2012-12-051-1/+1
| * | | | | | | | mci: Fix capacity calculation for high capacity MMC cardsSascha Hauer2012-12-031-7/+15
| * | | | | | | | mci: Add STUFF_BITS and use itSascha Hauer2012-11-291-5/+36
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'for-next/led'Sascha Hauer2012-12-073-0/+71
|\ \ \ \ \ \ \ \