diff options
author | 2008-12-02 15:55:43 -0800 | |
---|---|---|
committer | 2008-12-02 15:55:43 -0800 | |
commit | e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13 (patch) | |
tree | 04435004a39c68d335557bbe77f06153cdf9d709 /fs/ubifs/commit.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | sparc64: Fix offset calculation in compute_size() (diff) | |
download | linux-dev-e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13.tar.xz linux-dev-e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix offset calculation in compute_size()
rtc: rtc-starfire fixes
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions