Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...
[pandora-kernel.git] / include / linux / if_tun.h
Simple merge