diff options
| author | Ingo Molnar <[email protected]> | 2015-10-28 12:17:01 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-10-28 12:17:20 +0000 |
| commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /drivers/net/xen-netback/interface.c | |
| parent | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau... (diff) | |
| parent | block: re-add discard_granularity and alignment checks (diff) | |
| download | kernel-e4340bbb07dd38339c0773543dd928886e512a57.tar.gz kernel-e4340bbb07dd38339c0773543dd928886e512a57.zip | |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
0 files changed, 0 insertions, 0 deletions