Merge branch 3.13-rc4 into usb-next

This commit is contained in:
Greg Kroah-Hartman
2013-12-16 08:46:03 -08:00
121 changed files with 6996 additions and 5240 deletions

View File

@@ -495,7 +495,7 @@ static bool sg_miter_get_next_page(struct sg_mapping_iter *miter)
* true if @miter contains the valid mapping. false if end of sg
* list is reached.
*/
static bool sg_miter_skip(struct sg_mapping_iter *miter, off_t offset)
bool sg_miter_skip(struct sg_mapping_iter *miter, off_t offset)
{
sg_miter_stop(miter);
@@ -513,6 +513,7 @@ static bool sg_miter_skip(struct sg_mapping_iter *miter, off_t offset)
return true;
}
EXPORT_SYMBOL(sg_miter_skip);
/**
* sg_miter_next - proceed mapping iterator to the next mapping