diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 15:53:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 15:53:47 -0800 |
| commit | e252f4db187ef02d06c8551069d944d327b8bb9a (patch) | |
| tree | 0e704cc34161fc839ef203fbf71106de52e19a7d /drivers/power/power_supply.h | |
| parent | 2e93960c4d712096902c16fe5511fc91502c2527 (diff) | |
| parent | 7838c15b8dd18e78a523513749e5b54bda07b0cb (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Block: use round_jiffies_up()
Add round_jiffies_up and related routines
block: fix __blkdev_get() for removable devices
generic-ipi: fix the smp_mb() placement
blk: move blk_delete_timer call in end_that_request_last
block: add timer on blkdev_dequeue_request() not elv_next_request()
bio: define __BIOVEC_PHYS_MERGEABLE
block: remove unused ll_new_mergeable()
Diffstat (limited to 'drivers/power/power_supply.h')
0 files changed, 0 insertions, 0 deletions