diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 09:36:57 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 09:36:57 -0800 |
| commit | 2c76744b1b7850770712788a874f479d8033dc72 (patch) | |
| tree | e86b20141a28e20534c37d757ff9f7663609794c /net/ipv6/xfrm6_mode_tunnel.c | |
| parent | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (diff) | |
| parent | 8bec2e9e2efa8660c88077b2f1524b7a36eda714 (diff) | |
Merge branch 'rtc' of git://github.com/hzhuang1/linux into next/drivers
* 'rtc' of git://github.com/hzhuang1/linux:
rtc: sa1100: add OF support
Diffstat (limited to 'net/ipv6/xfrm6_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions