diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 21:54:15 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 21:54:15 +0400 |
| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /fs/char_dev.c | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
| download | linux-7266d48fca8ee2a15d15222c41f887e10db54c5a.tar.xz | |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/char_dev.c')
0 files changed, 0 insertions, 0 deletions