diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 14:11:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 14:11:34 -0700 |
| commit | cc8a0a943948d1b1bc803b37486831af7b04dd38 (patch) | |
| tree | 23bf940031577793d6ba8c4bc2609817c9c38538 /drivers/cpuidle/cpuidle-pseries.c | |
| parent | d857da7b70b3a38a846211b30442aad10ce577bd (diff) | |
| parent | 669d3d123395ce00c7a1c4e3ca0254b2f9ec95d0 (diff) | |
| download | talos-op-linux-cc8a0a943948d1b1bc803b37486831af7b04dd38.tar.gz talos-op-linux-cc8a0a943948d1b1bc803b37486831af7b04dd38.zip | |
Merge tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs
Pull UBI/UBIFS updates from Richard Weinberger:
"Minor fixes for UBI and UBIFS"
* tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs:
UBI: Remove unnecessary `\'
UBI: Use static class and attribute groups
UBI: add a helper function for updatting on-flash layout volumes
UBI: Fastmap: Do not add vol if it already exists
UBI: Init vol->reserved_pebs by assignment
UBI: Fastmap: Rename variables to make them meaningful
UBI: Fastmap: Remove unnecessary `\'
UBI: Fastmap: Use max() to get the larger value
ubifs: fix to check error code of register_shrinker
UBI: block: Dynamically allocate minor numbers
Diffstat (limited to 'drivers/cpuidle/cpuidle-pseries.c')
0 files changed, 0 insertions, 0 deletions
