diff options
author | Linus Torvalds | 2011-05-24 11:51:26 -0700 |
---|---|---|
committer | Linus Torvalds | 2011-05-24 11:51:26 -0700 |
commit | 4d429480352c63db2228489f0db9fd381cdc3c9c (patch) | |
tree | 96a3bc976735ef01d5d5e42353ae1dd795d34370 /drivers/acpi/bus.c | |
parent | eb08d8ff476ad39a149e1044c7d3fd742a168864 (diff) | |
parent | ab50ff684707031ed4bad2fdd313208ae392e5bb (diff) |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: switch to dynamic printks
UBI: turn some macros into static inline
UBI: improve checking in debugging prints
UBI: fix typo in a message
UBI: fix minor stylistic issues
UBI: use __packed instead of __attribute__((packed))
UBI: cleanup comments around volume properties
UBI: re-name set volume properties ioctl
UBI: make the control character device non-seekable
Diffstat (limited to 'drivers/acpi/bus.c')
0 files changed, 0 insertions, 0 deletions