diff options
| author |   Matt Fleming <matt.fleming@intel.com> | 2014-10-03 22:15:56 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-10-03 22:15:56 +0100 |
| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a /fs/xfs/xfs_trans_inode.c | |
| parent | Linux 3.17-rc7 (diff) | |
| parent | rtc: Disable EFI rtc for x86 (diff) | |
| download | linux-dev-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.xz linux-dev-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.zip | |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
Diffstat (limited to 'fs/xfs/xfs_trans_inode.c')
0 files changed, 0 insertions, 0 deletions