diff options
| author | Jiri Kosina | 2011-09-15 15:08:05 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2011-09-15 15:08:18 +0200 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /fs/locks.c | |
| parent | viacam: Don't explode if pci_find_bus() returns NULL (diff) | |
| parent | mm: account skipped entries to avoid looping in find_get_pages (diff) | |
| download | kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.tar.gz kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.tar.xz kernel-qcow2-linux-e060c38434b2caa78efe7cedaff4191040b65a15.zip | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions