diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 20:32:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 20:32:50 +0300 |
| commit | 9035a6450d124a7787e5e3272b630a79d201555f (patch) | |
| tree | 551d8ad66a564a1ec2552168b9cf1b08d1ebc6c3 /fs/nfs/dir.c | |
| parent | a07f523f264095759c6bb6e0e7a81c4d15bc3336 (diff) | |
| parent | c9c041fcb1a4d69ed4791f00b57554eeb341d148 (diff) | |
| download | linux-9035a6450d124a7787e5e3272b630a79d201555f.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
hp-wmi: remove double free caused by merge conflict
Diffstat (limited to 'fs/nfs/dir.c')
0 files changed, 0 insertions, 0 deletions