Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
David S. Miller 2008-04-17 23:56:30 -07:00
commit 1e42198609
346 changed files with 8374 additions and 5833 deletions

View file

@ -158,7 +158,7 @@ match:
t += 7 + *ip++;
}
m_pos -= le16_to_cpu(get_unaligned(
(const unsigned short *)ip) >> 2);
(const unsigned short *)ip)) >> 2;
ip += 2;
if (m_pos == op)
goto eof_found;