diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-22 22:37:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-22 22:37:04 -0700 |
| commit | 2d4833aae65589ba4317dd325fe20c8b25c14173 (patch) | |
| tree | 231672eb67197387f94bfda9a0995ddd002dbfbd /drivers/media/video/v4l2-ioctl.c | |
| parent | f3c58aceaa3f237ba43735805f4677950327b8ee (diff) | |
| parent | 6a6d01d374d03bd2f90030200cb78567444addc4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/linux/if_pppox.h
Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
0 files changed, 0 insertions, 0 deletions