Eric Paris
b7d3622a39
Merge tag 'v3.13' into for-3.15
...
Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
2014-03-07 11:41:32 -05:00
..
2010-10-21 10:12:58 +11:00
2011-02-01 11:12:30 -05:00
2011-12-19 11:23:56 +11:00
2011-09-09 16:56:32 -07:00
2005-04-16 15:20:36 -07:00
2012-04-09 12:22:47 -04:00
2013-07-25 13:02:18 -04:00
2013-07-25 13:02:31 -04:00
2008-08-15 08:40:47 +10:00
2008-04-28 09:29:04 +10:00
2013-07-25 13:02:18 -04:00
2013-07-25 13:02:18 -04:00
2011-08-01 17:58:33 -07:00
2013-09-18 13:52:20 -04:00
2012-04-09 12:22:48 -04:00
2014-03-07 11:41:32 -05:00
2005-04-16 15:20:36 -07:00
2010-12-07 16:44:01 -05:00
2010-12-07 16:44:01 -05:00
2010-10-21 10:12:41 +11:00
2010-08-02 15:35:04 +10:00
2005-04-16 15:20:36 -07:00