diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-29 14:19:32 +1000 |
| commit | 173a1caceaa301720d2d0521ec282c7d9b4d664b (patch) | |
| tree | b5bdf625e472ee8679ea866f2aa77e8020d370a6 /drivers/staging/batman-adv/README | |
| parent | 4282a20a1d2e5c1be92d839c9baa4671123b4349 (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
Diffstat (limited to 'drivers/staging/batman-adv/README')
| -rw-r--r-- | drivers/staging/batman-adv/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README index 14244a2c4e4f..7192b7fa2183 100644 --- a/drivers/staging/batman-adv/README +++ b/drivers/staging/batman-adv/README @@ -1,4 +1,4 @@ -[state: 03-05-2010] +[state: 12-06-2010] BATMAN-ADV ---------- |