From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2014 23:23:38 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: MMI-PSA29.97-13-9~12476
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=159d8133d0b54a501a41a66fe3a0e7d16405e36d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "Usual rocket science -- mostly documentation and comment updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  sparse: fix comment
  doc: fix double words
  isdn: capi: fix "CAPI_VERSION" comment
  doc: DocBook: Fix typos in xml and template file
  Bluetooth: add module name for btwilink
  driver core: unexport static function create_syslog_header
  mmc: core: typo fix in printk specifier
  ARM: spear: clean up editing mistake
  net-sysfs: fix comment typo 'CONFIG_SYFS'
  doc: Insert MODULE_ in module-signing macros
  Documentation: update URL to hfsplus Technote 1150
  gpio: update path to documentation
  ixgbe: Fix format string in ixgbe_fcoe.
  Kconfig: Remove useless "default N" lines
  user_namespace.c: Remove duplicated word in comment
  CREDITS: fix formatting
  treewide: Fix typo in Documentation/DocBook
  mm: Fix warning on make htmldocs caused by slab.c
  ata: ata-samsung_cf: cleanup in header file
  idr: remove unused prototype of idr_free()
---

159d8133d0b54a501a41a66fe3a0e7d16405e36d
diff --cc include/linux/idr.h
index 9c95d210458b,ff94a4875e1c..f669585c4fc5
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@@ -82,10 -82,8 +82,9 @@@ int idr_for_each(struct idr *idp
  void *idr_get_next(struct idr *idp, int *nextid);
  void *idr_replace(struct idr *idp, void *ptr, int id);
  void idr_remove(struct idr *idp, int id);
- void idr_free(struct idr *idp, int id);
  void idr_destroy(struct idr *idp);
  void idr_init(struct idr *idp);
 +bool idr_is_empty(struct idr *idp);
  
  /**
   * idr_preload_end - end preload section started with idr_preload()