diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:39:56 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:39:56 +1100 |
commit | 8b6a4b5748f0c921c3d8fec7b4ff5f12bcd3c550 (patch) | |
tree | 3a49f43d9c253c6770d061ae8929ed8ee4e079f7 /drivers/mtd | |
parent | 886649d48c3704b2637b5615fa750d9e29d44f80 (diff) | |
parent | 6caa1b4b8c419cb4740b80ac07bacdfab5a09c30 (diff) |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'drivers/mtd')
-rw-r--r--[-rwxr-xr-x] | drivers/mtd/chips/cfi_util.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | drivers/mtd/inftlcore.c | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c index ca584d0380b4..ca584d0380b4 100755..100644 --- a/drivers/mtd/chips/cfi_util.c +++ b/drivers/mtd/chips/cfi_util.c diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c index 8aca5523a337..8aca5523a337 100755..100644 --- a/drivers/mtd/inftlcore.c +++ b/drivers/mtd/inftlcore.c |