diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 17:56:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 17:56:17 +0200 |
| commit | 6ed962a208cb72cff29a107d6c73247526017ddb (patch) | |
| tree | 2bd574d8ab1db79b369735ba0519a66760019189 /fs/xfs/xfs_discard.h | |
| parent | Linux 3.1-rc4 (diff) | |
| parent | USB: pl2303: remove unreachable code (diff) | |
| download | linux-6ed962a208cb72cff29a107d6c73247526017ddb.tar.xz linux-6ed962a208cb72cff29a107d6c73247526017ddb.zip | |
Merge 3.1-rc4 into usb-next
This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/xfs/xfs_discard.h')
0 files changed, 0 insertions, 0 deletions