diff options
| author | Takashi Iwai <[email protected]> | 2012-08-20 22:14:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2012-08-20 22:14:26 +0200 |
| commit | ddf83485d7da468251716b8040bac1280622181e (patch) | |
| tree | d28e9b511dedcfed447577f4bb49a99b244a9430 /fs/jbd2/commit.c | |
| parent | 099d53c308f50e8ee5b6638ec3f40f0104b3ee31 (diff) | |
| parent | 535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 (diff) | |
Merge branch 'for-linus' into for-next
Conflicts:
sound/pci/hda/hda_codec.c
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions