diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 01:15:40 -0400 |
| commit | 42de5532f4a58a52a60bdd8bd4f80f9f210dd65b (patch) | |
| tree | f624579c4c27e1ffcba5e4141fcc0877c3a6ae56 /arch/blackfin | |
| parent | e9e8b4dd142da3b6cbf301ba922804d6cdc31a17 (diff) | |
| parent | 2a6b69765ad794389f2fc3e14a0afa1a995221c2 (diff) | |
| download | kernel_samsung_crespo-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.zip kernel_samsung_crespo-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.tar.gz kernel_samsung_crespo-42de5532f4a58a52a60bdd8bd4f80f9f210dd65b.tar.bz2 | |
Merge branch 'bugzilla-13931-sleep-nvs' into release
Conflicts:
drivers/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/blackfin')
0 files changed, 0 insertions, 0 deletions