diff options
| author | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-20 13:33:17 -0400 |
|---|---|---|
| committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-09-20 13:33:17 -0400 |
| commit | 5e0a4919ccb230ab449826ef91bdf38a4ed283e5 (patch) | |
| tree | 3790db1aa69ed50b08f34c21c1796785df6a0304 /drivers/mtd/mtdconcat.c | |
| parent | c00613f1fad38acec00ef2c009ae4e73110084ac (diff) | |
| parent | 5dd038629bdedef22d5ecad2d5e75ad81f4dc694 (diff) | |
Merge remote-tracking branch 'oneiric-ubuntu/pandaboard' into pandaboard-litmus
Remote branch is from Ubuntu Oneiric (tag Ubuntu-3.0.0-1215.27) with
minor patch to the TWL-RTC code. Trying to pull this into LITMUS^RT
staging (as of 9/20/2012) to get LITMUS^RT running on the PandaBoard.
Conflicts:
Makefile
fs/exec.c
include/linux/fs.h
kernel/fork.c
Diffstat (limited to 'drivers/mtd/mtdconcat.c')
0 files changed, 0 insertions, 0 deletions