diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 21:03:43 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 21:03:43 +0200 |
| commit | 949abd84cd54ff864efca9df822d1e02a56694ec (patch) | |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 /drivers/ata/Kconfig | |
| parent | [ARM] 5529/1: davinci: MMC platform support: DMA_32BIT_MASK --> DMA_BIT_MASK(32) (diff) | |
| parent | Merge branch 'omap4' into for-next (diff) | |
| download | linux-949abd84cd54ff864efca9df822d1e02a56694ec.tar.xz linux-949abd84cd54ff864efca9df822d1e02a56694ec.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/ata/Kconfig')
0 files changed, 0 insertions, 0 deletions