diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
| commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
| tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /fs/jbd2/commit.c | |
| parent | [ARM] s3c: S3C options should depend on PLAT_S3C (diff) | |
| parent | [ARM] pxa/littleton: add preliminary I2C board info (da9034 + max7320) (diff) | |
| download | wireguard-linux-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.tar.xz wireguard-linux-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions