diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 20:06:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 20:06:01 -0800 |
| commit | e9e352e9100b98aed1a5fb9e33355c29fb07d5b1 (patch) | |
| tree | 92eb59640f3bfc33f55c54f0494052530a9560dd /fs/ocfs2/suballoc.h | |
| parent | b3a4bcaa5a56860610bd096829702f80273b5a67 (diff) | |
| parent | 2b8454a75b90d7cd1ac325a0baba77244733354f (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
Pull chrome platform cleanups and improvements from Olof Johansson:
- Use deferred probing on Chrome OS platforms for the i2c device
registration. This fixes a long-standing race of initialization of
touchpad/screen on Chromebooks.
- Added in platform device registration for pstore console on supported
hardware
- Misc smaller fixes (__initdata, module exit cleanup, etc)
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
platform/chrome: unregister platform driver/device when module exit
platform/chrome: Make i2c_adapter_names static
platform/chrome: chromeos_laptop - fix incorrect placement of __initdata tag
platform/chrome: chromeos_laptop - Use deferred probing
platform/chrome: chromeos_laptop - Restructure device associations
platform/chrome: Add pstore platform_device
Diffstat (limited to 'fs/ocfs2/suballoc.h')
0 files changed, 0 insertions, 0 deletions