Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

This commit is contained in:
Linus Torvalds 2006-01-15 16:43:29 -08:00
commit 3f02d072d4
41 changed files with 306 additions and 334 deletions

View file

@ -104,7 +104,7 @@ struct sadb_prop {
/* followed by:
struct sadb_comb sadb_combs[(sadb_prop_len +
sizeof(uint64_t) - sizeof(struct sadb_prop)) /
sizeof(strut sadb_comb)]; */
sizeof(struct sadb_comb)]; */
struct sadb_comb {
uint8_t sadb_comb_auth;