diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:44:40 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 16:44:40 +0100 |
commit | e64de3b96c1ba3c1de236a4a103ec21234a5849f (patch) | |
tree | b4ed91858a3d353bd72e3be101433ac821759379 /fs/nfs/blocklayout | |
parent | w1/ds2482: use module_i2c_driver to simplify the code (diff) | |
parent | Linux 3.7-rc3 (diff) | |
download | linux-e64de3b96c1ba3c1de236a4a103ec21234a5849f.tar.xz linux-e64de3b96c1ba3c1de236a4a103ec21234a5849f.zip |
Merge 3.7-rc3 into char-misc-next
This brings in the various 3.7-rc3 char fixes into char-misc-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs/blocklayout')
0 files changed, 0 insertions, 0 deletions