diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 13:17:34 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 13:17:34 (GMT) |
| commit | a32750c2ca6f697903b19063fc86f4272865e3a1 (patch) | |
| tree | 57a23806c5358855eb426c006c88943afa683b1b /fs/xfs/xfs_inum.h | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | d870ea1d6bc5057f2599416655b42ab192dae6d0 (diff) | |
| download | linux-a32750c2ca6f697903b19063fc86f4272865e3a1.tar.xz | |
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'fs/xfs/xfs_inum.h')
0 files changed, 0 insertions, 0 deletions